diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/usb/misc/ftdi-elan.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
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 == |