From 3387a12739692e702a56ef9e6ae1ed4743136d02 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed, 20 Feb 2008 20:49:53 +0000
Subject: [PATCH] --- yaml --- r: 93297 b: refs/heads/master c:
 9b0f2582d57d4c9081307c86e11afc9169de7d3e h: refs/heads/master i:   93295:
 baf607d47ef71615015720c89dfefc0265a4c576 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/serial/ftdi_sio.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff0d8853a4b0..eb2fd6fc0e18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2097890c43a8fe90763f31b0010fd6963f5512c8
+refs/heads/master: 9b0f2582d57d4c9081307c86e11afc9169de7d3e
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index 3abb3c863647..4643212eb959 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -533,9 +533,8 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, unsigned
 	}
 
 	buf = kmalloc(1, GFP_NOIO);
-	if (!buf) {
+	if (!buf)
 		return -ENOMEM;
-	}
 
 	clear &= ~set;	/* 'set' takes precedence over 'clear' */
 	urb_value = 0;
@@ -568,6 +567,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, unsigned
 				(clear & TIOCM_DTR) ? "LOW" : "unchanged",
 				(set & TIOCM_RTS) ? "HIGH" :
 				(clear & TIOCM_RTS) ? "LOW" : "unchanged");
+		/* FIXME: locking on last_dtr_rts */
 		priv->last_dtr_rts = (priv->last_dtr_rts & ~clear) | set;
 	}
 	return rv;