diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:06:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:06:43 +1000 |
| commit | 8a739ab326f38f967b3e1b20a7807240696154e2 (patch) | |
| tree | e550825cb247dba3c14d9b47f48c790f766f23fc /drivers/usb/serial/ch341.c | |
| parent | e31ca171aebb704d4d843fec816a4cd5b342fe42 (diff) | |
| parent | dbaf2455aa33b17982aacf21ceb54b0c2b1bf004 (diff) | |
Merge branch 'quilt/tty'
Conflicts:
arch/x86/include/asm/termios.h
Diffstat (limited to 'drivers/usb/serial/ch341.c')
| -rw-r--r-- | drivers/usb/serial/ch341.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 2830766f5b39..8c894a7d5dcf 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -300,8 +300,7 @@ static void ch341_close(struct usb_serial_port *port) /* open this device, set default parameters */ -static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port, - struct file *filp) +static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) { struct usb_serial *serial = port->serial; struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]); @@ -333,7 +332,7 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port, return -EPROTO; } - r = usb_serial_generic_open(tty, port, filp); + r = usb_serial_generic_open(tty, port); out: return r; } |