---

yaml --- r: 338551 b: refs/heads/master c: fef0b82 h: refs/heads/master i: 338549: 135d274 338547: 076336f 338543: ae27408 v: v3
git-mirror · Oct 30, 2012 · 364365a · 364365a
1 parent 3b6407c
commit 364365a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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);