diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/misc/ftdi-elan.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/ftdi-elan.c')
| -rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index c6f2f488a40f..0eb26a26115b 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
| @@ -758,7 +758,7 @@ static ssize_t ftdi_elan_read(struct file *file, char __user *buffer, | |||
| 758 | return bytes_read; | 758 | return bytes_read; |
| 759 | } | 759 | } |
| 760 | 760 | ||
| 761 | static void ftdi_elan_write_bulk_callback(struct urb *urb, struct pt_regs *regs) | 761 | static void ftdi_elan_write_bulk_callback(struct urb *urb) |
| 762 | { | 762 | { |
| 763 | struct usb_ftdi *ftdi = (struct usb_ftdi *)urb->context; | 763 | struct usb_ftdi *ftdi = (struct usb_ftdi *)urb->context; |
| 764 | if (urb->status && !(urb->status == -ENOENT || urb->status == | 764 | if (urb->status && !(urb->status == -ENOENT || urb->status == |