diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/usb/serial/usb_debug.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/usb_debug.c')
| -rw-r--r-- | drivers/usb/serial/usb_debug.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 614800972dc3..7b5bfc4edd3d 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c | |||
| @@ -43,11 +43,10 @@ static struct usb_driver debug_driver = { | |||
| 43 | .no_dynamic_id = 1, | 43 | .no_dynamic_id = 1, |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, | 46 | static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 47 | struct file *filp) | ||
| 48 | { | 47 | { |
| 49 | port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE; | 48 | port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE; |
| 50 | return usb_serial_generic_open(tty, port, filp); | 49 | return usb_serial_generic_open(tty, port); |
| 51 | } | 50 | } |
| 52 | 51 | ||
| 53 | /* This HW really does not support a serial break, so one will be | 52 | /* This HW really does not support a serial break, so one will be |