diff options
| author | Johan Hovold | 2009-12-24 12:42:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-03-02 23:53:38 +0100 |
| commit | a3f8168b7a3a7d9dfb9bb9caa1e009a5ce2a8493 (patch) | |
| tree | def82152d9b714f8c80d22d0ad9f33150c345e06 /drivers/usb/serial/ftdi_sio.c | |
| parent | USB: ftdi_sio: fix DMA buffers on stack (diff) | |
| download | kernel-qcow2-linux-a3f8168b7a3a7d9dfb9bb9caa1e009a5ce2a8493.tar.gz kernel-qcow2-linux-a3f8168b7a3a7d9dfb9bb9caa1e009a5ce2a8493.tar.xz kernel-qcow2-linux-a3f8168b7a3a7d9dfb9bb9caa1e009a5ce2a8493.zip | |
USB: ftdi_sio: clean up modem status handling
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index a6e5a0d95566..58698a6f837b 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2341,6 +2341,7 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) struct usb_serial_port *port = tty->driver_data; struct ftdi_private *priv = usb_get_serial_port_data(port); unsigned char *buf; + int len; int ret; dbg("%s TIOCMGET", __func__); @@ -2348,18 +2349,13 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) buf = kmalloc(2, GFP_KERNEL); if (!buf) return -ENOMEM; - + /* + * The 8U232AM returns a two byte value (the SIO a 1 byte value) in + * the same format as the data returned from the in point. + */ switch (priv->chip_type) { case SIO: - /* Request the status from the device */ - ret = usb_control_msg(port->serial->dev, - usb_rcvctrlpipe(port->serial->dev, 0), - FTDI_SIO_GET_MODEM_STATUS_REQUEST, - FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, - 0, 0, - buf, 1, WDR_TIMEOUT); - if (ret < 0) - goto out; + len = 1; break; case FT8U232AM: case FT232BM: @@ -2367,23 +2363,22 @@ static int ftdi_tiocmget(struct tty_struct *tty, struct file *file) case FT232RL: case FT2232H: case FT4232H: - /* the 8U232AM returns a two byte value (the sio is a 1 byte - value) - in the same format as the data returned from the in - point */ - ret = usb_control_msg(port->serial->dev, - usb_rcvctrlpipe(port->serial->dev, 0), - FTDI_SIO_GET_MODEM_STATUS_REQUEST, - FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, - 0, priv->interface, - buf, 2, WDR_TIMEOUT); - if (ret < 0) - goto out; + len = 2; break; default: ret = -EFAULT; goto out; } + ret = usb_control_msg(port->serial->dev, + usb_rcvctrlpipe(port->serial->dev, 0), + FTDI_SIO_GET_MODEM_STATUS_REQUEST, + FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE, + 0, priv->interface, + buf, len, WDR_TIMEOUT); + if (ret < 0) + goto out; + ret = (buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) | (buf[0] & FTDI_SIO_CTS_MASK ? TIOCM_CTS : 0) | (buf[0] & FTDI_SIO_RI_MASK ? TIOCM_RI : 0) | |