From abc2c737f5d81ad420191109b681230f2c607d7a Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Wed, 25 Apr 2012 15:56:31 +0200
Subject: [PATCH] --- yaml --- r: 303599 b: refs/heads/master c:
 6f1efd6c5aa63ddcfe1ffc60ade716f5421766f4 h: refs/heads/master i:   303597:
 824f68bd5c06183dd78668983a05d64ace82aaa7   303595:
 2832aed1f0cb0995be676ab5269147eb940a8e39   303591:
 780a3849b46d53a82df55b03d356a238fd488366   303583:
 da5dd189af90a6fd8f96aba7b247eb7c7958aca7 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/usb/serial/pl2303.c | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4cf8f8435b74..8357b4fa2415 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c5176692457c3f249559d29a69affad7447b326
+refs/heads/master: 6f1efd6c5aa63ddcfe1ffc60ade716f5421766f4
diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c
index a1a9062954c4..4917b4e79bb5 100644
--- a/trunk/drivers/usb/serial/pl2303.c
+++ b/trunk/drivers/usb/serial/pl2303.c
@@ -523,12 +523,11 @@ static int pl2303_tiocmset(struct tty_struct *tty,
 			   unsigned int set, unsigned int clear)
 {
 	struct usb_serial_port *port = tty->driver_data;
+	struct usb_serial *serial = port->serial;
 	struct pl2303_private *priv = usb_get_serial_port_data(port);
 	unsigned long flags;
 	u8 control;
-
-	if (!usb_get_intfdata(port->serial->interface))
-		return -ENODEV;
+	int ret;
 
 	spin_lock_irqsave(&priv->lock, flags);
 	if (set & TIOCM_RTS)
@@ -542,7 +541,14 @@ static int pl2303_tiocmset(struct tty_struct *tty,
 	control = priv->line_control;
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	return set_control_lines(port->serial->dev, control);
+	mutex_lock(&serial->disc_mutex);
+	if (!serial->disconnected)
+		ret = set_control_lines(serial->dev, control);
+	else
+		ret = -ENODEV;
+	mutex_unlock(&serial->disc_mutex);
+
+	return ret;
 }
 
 static int pl2303_tiocmget(struct tty_struct *tty)
@@ -556,9 +562,6 @@ static int pl2303_tiocmget(struct tty_struct *tty)
 
 	dbg("%s (%d)", __func__, port->number);
 
-	if (!usb_get_intfdata(port->serial->interface))
-		return -ENODEV;
-
 	spin_lock_irqsave(&priv->lock, flags);
 	mcr = priv->line_control;
 	status = priv->line_status;