From 364365accfca0020a59100e8a1299425fdf5c1c9 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Mon, 29 Oct 2012 10:56:22 +0100 Subject: [PATCH] --- yaml --- r: 338551 b: refs/heads/master c: fef0b828a3c7a7123aedb4b1d8415369f75e0a58 h: refs/heads/master i: 338549: 135d27461e4225d49c9cb7ca376ba8bed3b49d16 338547: 076336fa032d14e26572271f6af7c7ab2541e688 338543: ae27408884c501826ab93cb23f525ea60b527d16 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d026142f1053..c20039298b4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81e84424f9da413b4e3edb00e25a19783304c7d1 +refs/heads/master: fef0b828a3c7a7123aedb4b1d8415369f75e0a58 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 48cbc39e6d8e..2ad5e7c7f226 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/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);