diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-09 01:00:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-09 01:00:46 -0700 |
| commit | bbba3abfba584a2439316e383b9ee3a4bad85e6d (patch) | |
| tree | 73b4a07d69d8fd787a19b5316da1dffcadee9b93 /usb | |
| parent | d0bb6c8fdd5a5224383304c0e46a4d60ed8b8b38 (diff) | |
| download | patches-bbba3abfba584a2439316e383b9ee3a4bad85e6d.tar.gz | |
2.6.17-rc3-git16 refresh
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-phidget-interfacekit-make-inputs-pollable-and-new-device-support.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usb/usb-phidget-interfacekit-make-inputs-pollable-and-new-device-support.patch b/usb/usb-phidget-interfacekit-make-inputs-pollable-and-new-device-support.patch index f9b60a324ad203..bd9df53b7ddb19 100644 --- a/usb/usb-phidget-interfacekit-make-inputs-pollable-and-new-device-support.patch +++ b/usb/usb-phidget-interfacekit-make-inputs-pollable-and-new-device-support.patch @@ -15,8 +15,8 @@ Signed-off-by: Daniel Saakes <daniel@saakes.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/misc/phidgetkit.c | 305 ++++++++++++++++++++++++++++++------------ - 1 file changed, 219 insertions(+), 86 deletions(-) + drivers/usb/misc/phidgetkit.c | 303 ++++++++++++++++++++++++++++++------------ + 1 file changed, 218 insertions(+), 85 deletions(-) --- gregkh-2.6.orig/drivers/usb/misc/phidgetkit.c +++ gregkh-2.6/drivers/usb/misc/phidgetkit.c @@ -97,12 +97,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + u8 *buffer; int retval; - int n; - ++ + if (enable) + set_bit(output_num, &kit->outputs); + else + clear_bit(output_num, &kit->outputs); -+ + buffer = kzalloc(4, GFP_KERNEL); if (!buffer) { - dev_err(&kit->udev->dev, "%s - out of memory\n", @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - } - - dev_dbg(&kit->udev->dev, "sending data: %02x\n", buffer[0]); -+ dev_dbg(&kit->udev->dev, "sending data: 0x%04x\n", kit->outputs); ++ dev_dbg(&kit->udev->dev, "sending data: 0x%04x\n", (u16)kit->outputs); retval = usb_control_msg(kit->udev, usb_sndctrlpipe(kit->udev, 0), @@ -428,10 +428,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kit->udev = usb_get_dev(dev); kit->intf = intf; -- usb_fill_int_urb(kit->irq, kit->udev, pipe, kit->data, -- (maxp > 8 ? 8 : maxp), + INIT_WORK(&kit->do_notify, do_notify, kit); -+ usb_fill_int_urb(kit->irq, kit->udev, pipe, kit->data, + usb_fill_int_urb(kit->irq, kit->udev, pipe, kit->data, +- (maxp > 8 ? 8 : maxp), + maxp > URB_INT_SIZE ? URB_INT_SIZE : maxp, interfacekit_irq, kit, endpoint->bInterval); kit->irq->transfer_dma = kit->data_dma; |