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/serial/generic.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 21cbaa0fb96b..36042937e77f 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -248,7 +248,7 @@ int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port) | |||
| 248 | return (chars); | 248 | return (chars); |
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *regs) | 251 | void usb_serial_generic_read_bulk_callback (struct urb *urb) |
| 252 | { | 252 | { |
| 253 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; | 253 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; |
| 254 | struct usb_serial *serial = port->serial; | 254 | struct usb_serial *serial = port->serial; |
| @@ -287,7 +287,7 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *reg | |||
| 287 | } | 287 | } |
| 288 | EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); | 288 | EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); |
| 289 | 289 | ||
| 290 | void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *regs) | 290 | void usb_serial_generic_write_bulk_callback (struct urb *urb) |
| 291 | { | 291 | { |
| 292 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; | 292 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; |
| 293 | 293 | ||