From a3e7849fbd00939f2b40a1cba4dbb7226cee5082 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 12:36:22 +0100
Subject: [PATCH] --- yaml --- r: 364383 b: refs/heads/master c:
 f45d0a5aa593cdf48a37489fc61c145e16964288 h: refs/heads/master i:   364381:
 40c02a35e3d7065570a2f64effa0ebcb2c76206c   364379:
 8f4beb09ed118aa0afcf32297b14477fb9452013   364375:
 45d6b311ac76fab32ff729ded544626d2a211405   364367:
 77d6701937c3829425dd6352fa19b687f2c300f8   364351:
 00ffcd7c4a9f3e022a99ff71451163b5fa0251b5 v: v3

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

diff --git a/[refs] b/[refs]
index bb51994b7b42..814ca0194671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5789a86890423e1460362798140c26822798b1
+refs/heads/master: f45d0a5aa593cdf48a37489fc61c145e16964288
diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c
index 5b2e62f6dc50..e7e407b67994 100644
--- a/trunk/drivers/usb/serial/pl2303.c
+++ b/trunk/drivers/usb/serial/pl2303.c
@@ -248,14 +248,15 @@ static int pl2303_port_remove(struct usb_serial_port *port)
 	return 0;
 }
 
-static int set_control_lines(struct usb_device *dev, u8 value)
+static int pl2303_set_control_lines(struct usb_serial_port *port, u8 value)
 {
+	struct usb_device *dev = port->serial->dev;
 	int retval;
 
 	retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
 				 SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
 				 value, 0, NULL, 0, 100);
-	dev_dbg(&dev->dev, "%s - value = %d, retval = %d\n", __func__,
+	dev_dbg(&port->dev, "%s - value = %d, retval = %d\n", __func__,
 		value, retval);
 	return retval;
 }
@@ -437,7 +438,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
 	if (control != priv->line_control) {
 		control = priv->line_control;
 		spin_unlock_irqrestore(&priv->lock, flags);
-		set_control_lines(serial->dev, control);
+		pl2303_set_control_lines(port, control);
 	} else {
 		spin_unlock_irqrestore(&priv->lock, flags);
 	}
@@ -480,7 +481,7 @@ static void pl2303_dtr_rts(struct usb_serial_port *port, int on)
 		priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS);
 	control = priv->line_control;
 	spin_unlock_irqrestore(&priv->lock, flags);
-	set_control_lines(port->serial->dev, control);
+	pl2303_set_control_lines(port, control);
 }
 
 static void pl2303_close(struct usb_serial_port *port)
@@ -550,7 +551,7 @@ static int pl2303_tiocmset(struct tty_struct *tty,
 
 	mutex_lock(&serial->disc_mutex);
 	if (!serial->disconnected)
-		ret = set_control_lines(serial->dev, control);
+		ret = pl2303_set_control_lines(port, control);
 	else
 		ret = -ENODEV;
 	mutex_unlock(&serial->disc_mutex);