diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index d889216bcb30..adeb23fb8003 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -2292,11 +2292,8 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) | |||
| 2292 | FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, | 2292 | FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, |
| 2293 | 0, 0, | 2293 | 0, 0, |
| 2294 | buf, 1, WDR_TIMEOUT); | 2294 | buf, 1, WDR_TIMEOUT); |
| 2295 | if (ret < 0) { | 2295 | if (ret < 0) |
| 2296 | dbg("%s Could not get modem status of device - err: %d", __func__, | ||
| 2297 | ret); | ||
| 2298 | return ret; | 2296 | return ret; |
| 2299 | } | ||
| 2300 | break; | 2297 | break; |
| 2301 | case FT8U232AM: | 2298 | case FT8U232AM: |
| 2302 | case FT232BM: | 2299 | case FT232BM: |
| @@ -2311,15 +2308,11 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) | |||
| 2311 | FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, | 2308 | FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, |
| 2312 | 0, priv->interface, | 2309 | 0, priv->interface, |
| 2313 | buf, 2, WDR_TIMEOUT); | 2310 | buf, 2, WDR_TIMEOUT); |
| 2314 | if (ret < 0) { | 2311 | if (ret < 0) |
| 2315 | dbg("%s Could not get modem status of device - err: %d", __func__, | ||
| 2316 | ret); | ||
| 2317 | return ret; | 2312 | return ret; |
| 2318 | } | ||
| 2319 | break; | 2313 | break; |
| 2320 | default: | 2314 | default: |
| 2321 | return -EFAULT; | 2315 | return -EFAULT; |
| 2322 | break; | ||
| 2323 | } | 2316 | } |
| 2324 | 2317 | ||
| 2325 | return (buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) | | 2318 | return (buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) | |