diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
| commit | cdcc164fdfa45cfbc6ceefd0db662cb8595d0273 (patch) | |
| tree | 5505922aea9863cbe8d6d573f4ad18a5d118a23f /drivers/usb/serial/usb_debug.c | |
| parent | 0ae00a3808e20a1479a4794b5c617a14bd477de3 (diff) | |
| parent | 9fd6651b708634b928622565334c51fa60ad8896 (diff) | |
Merge branch 'quilt/tty'
Conflicts:
arch/x86/include/asm/termios.h
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 = { .no_dynamic_id = 1, }; -static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, - struct file *filp) +static int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port) { port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE; - return usb_serial_generic_open(tty, port, filp); + return usb_serial_generic_open(tty, port); } /* This HW really does not support a serial break, so one will be |