diff options
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 985cbcf48bda..4a208fe85bc9 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -33,8 +33,7 @@ | |||
33 | /* | 33 | /* |
34 | * Function Prototypes | 34 | * Function Prototypes |
35 | */ | 35 | */ |
36 | static int cp210x_open(struct tty_struct *, struct usb_serial_port *, | 36 | static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *); |
37 | struct file *); | ||
38 | static void cp210x_cleanup(struct usb_serial_port *); | 37 | static void cp210x_cleanup(struct usb_serial_port *); |
39 | static void cp210x_close(struct usb_serial_port *); | 38 | static void cp210x_close(struct usb_serial_port *); |
40 | static void cp210x_get_termios(struct tty_struct *, | 39 | static void cp210x_get_termios(struct tty_struct *, |
@@ -368,8 +367,7 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) { | |||
368 | return baud; | 367 | return baud; |
369 | } | 368 | } |
370 | 369 | ||
371 | static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port, | 370 | static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port) |
372 | struct file *filp) | ||
373 | { | 371 | { |
374 | struct usb_serial *serial = port->serial; | 372 | struct usb_serial *serial = port->serial; |
375 | int result; | 373 | int result; |
@@ -399,12 +397,6 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port, | |||
399 | 397 | ||
400 | /* Configure the termios structure */ | 398 | /* Configure the termios structure */ |
401 | cp210x_get_termios(tty, port); | 399 | cp210x_get_termios(tty, port); |
402 | |||
403 | /* Set the DTR and RTS pins low */ | ||
404 | cp210x_tiocmset_port(tty ? (struct usb_serial_port *) tty->driver_data | ||
405 | : port, | ||
406 | NULL, TIOCM_DTR | TIOCM_RTS, 0); | ||
407 | |||
408 | return 0; | 400 | return 0; |
409 | } | 401 | } |
410 | 402 | ||