diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/usb/serial/aircable.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/serial/aircable.c')
| -rw-r--r-- | drivers/usb/serial/aircable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index 2ccd9ded52a5..812275509137 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
| @@ -403,7 +403,7 @@ static int aircable_write(struct usb_serial_port *port, | |||
| 403 | 403 | ||
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | static void aircable_write_bulk_callback(struct urb *urb, struct pt_regs *regs) | 406 | static void aircable_write_bulk_callback(struct urb *urb) |
| 407 | { | 407 | { |
| 408 | struct usb_serial_port *port = urb->context; | 408 | struct usb_serial_port *port = urb->context; |
| 409 | int result; | 409 | int result; |
| @@ -444,7 +444,7 @@ static void aircable_write_bulk_callback(struct urb *urb, struct pt_regs *regs) | |||
| 444 | aircable_send(port); | 444 | aircable_send(port); |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | static void aircable_read_bulk_callback(struct urb *urb, struct pt_regs *regs) | 447 | static void aircable_read_bulk_callback(struct urb *urb) |
| 448 | { | 448 | { |
| 449 | struct usb_serial_port *port = urb->context; | 449 | struct usb_serial_port *port = urb->context; |
| 450 | struct aircable_private *priv = usb_get_serial_port_data(port); | 450 | struct aircable_private *priv = usb_get_serial_port_data(port); |