diff options
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 3 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 3edda3ed822a..fd35f73b5721 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
| @@ -1239,8 +1239,7 @@ static void digi_write_bulk_callback(struct urb *urb) | |||
| 1239 | 1239 | ||
| 1240 | /* port and serial sanity check */ | 1240 | /* port and serial sanity check */ |
| 1241 | if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) { | 1241 | if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) { |
| 1242 | dev_err(&port->dev, | 1242 | pr_err("%s: port or port->private is NULL, status=%d\n", |
| 1243 | "%s: port or port->private is NULL, status=%d\n", | ||
| 1244 | __func__, status); | 1243 | __func__, status); |
| 1245 | return; | 1244 | return; |
| 1246 | } | 1245 | } |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 050211afc07e..79dd1ae195e5 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -2005,6 +2005,8 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
| 2005 | "urb failed to set to rts/cts flow control\n"); | 2005 | "urb failed to set to rts/cts flow control\n"); |
| 2006 | } | 2006 | } |
| 2007 | 2007 | ||
| 2008 | /* raise DTR/RTS */ | ||
| 2009 | set_mctrl(port, TIOCM_DTR | TIOCM_RTS); | ||
| 2008 | } else { | 2010 | } else { |
| 2009 | /* | 2011 | /* |
| 2010 | * Xon/Xoff code | 2012 | * Xon/Xoff code |
| @@ -2052,6 +2054,8 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
| 2052 | } | 2054 | } |
| 2053 | } | 2055 | } |
| 2054 | 2056 | ||
| 2057 | /* lower DTR/RTS */ | ||
| 2058 | clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); | ||
| 2055 | } | 2059 | } |
| 2056 | return; | 2060 | return; |
| 2057 | } | 2061 | } |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index f8424d1bfc1b..585b7e663740 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
| @@ -730,7 +730,6 @@ static void mos7840_bulk_in_callback(struct urb *urb) | |||
| 730 | mos7840_port = urb->context; | 730 | mos7840_port = urb->context; |
| 731 | if (!mos7840_port) { | 731 | if (!mos7840_port) { |
| 732 | dbg("%s", "NULL mos7840_port pointer"); | 732 | dbg("%s", "NULL mos7840_port pointer"); |
| 733 | mos7840_port->read_urb_busy = false; | ||
| 734 | return; | 733 | return; |
| 735 | } | 734 | } |
| 736 | 735 | ||
