diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 050211afc07e..da7e334b0407 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -653,7 +653,6 @@ static struct usb_device_id id_table_combined [] = { | |||
653 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, | 653 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, |
654 | { USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) }, | 654 | { USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) }, |
655 | { USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) }, | 655 | { USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) }, |
656 | { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) }, | ||
657 | { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, | 656 | { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) }, |
658 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, | 657 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) }, |
659 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) }, | 658 | { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) }, |
@@ -2005,6 +2004,8 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
2005 | "urb failed to set to rts/cts flow control\n"); | 2004 | "urb failed to set to rts/cts flow control\n"); |
2006 | } | 2005 | } |
2007 | 2006 | ||
2007 | /* raise DTR/RTS */ | ||
2008 | set_mctrl(port, TIOCM_DTR | TIOCM_RTS); | ||
2008 | } else { | 2009 | } else { |
2009 | /* | 2010 | /* |
2010 | * Xon/Xoff code | 2011 | * Xon/Xoff code |
@@ -2052,6 +2053,8 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
2052 | } | 2053 | } |
2053 | } | 2054 | } |
2054 | 2055 | ||
2056 | /* lower DTR/RTS */ | ||
2057 | clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); | ||
2055 | } | 2058 | } |
2056 | return; | 2059 | return; |
2057 | } | 2060 | } |