diff options
| author | Johan Hovold | 2012-10-29 10:56:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-10-30 21:19:30 +0100 |
| commit | fef0b828a3c7a7123aedb4b1d8415369f75e0a58 (patch) | |
| tree | e8441683a251d9e14b05807d1d084dc2c2e47c3a /drivers/usb/serial/ftdi_sio.c | |
| parent | USB: ftdi_sio: remove unused private port-data (diff) | |
| download | kernel-qcow2-linux-fef0b828a3c7a7123aedb4b1d8415369f75e0a58.tar.gz kernel-qcow2-linux-fef0b828a3c7a7123aedb4b1d8415369f75e0a58.tar.xz kernel-qcow2-linux-fef0b828a3c7a7123aedb4b1d8415369f75e0a58.zip | |
USB: ftdi_sio: fix tiocmget indentation
Align the modem-control status operands as was originally indented.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 48cbc39e6d8e..2ad5e7c7f226 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2372,10 +2372,10 @@ static int ftdi_tiocmget(struct tty_struct *tty) 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) | - (buf[0] & FTDI_SIO_RLSD_MASK ? TIOCM_CD : 0) | + 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) | + (buf[0] & FTDI_SIO_RLSD_MASK ? TIOCM_CD : 0) | priv->last_dtr_rts; out: kfree(buf); |