From c0fdcc9fd3ef6b45fd4adcee9f17f8a065ff869e Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 6 Oct 2009 16:06:46 +0100
Subject: [PATCH] --- yaml --- r: 175323 b: refs/heads/master c:
 82fc5943430e3cbf15033ed4186a73f90906345d h: refs/heads/master i:   175321:
 4681d29dbcc3a839b385e7ad3edc80fc5e639db2   175319:
 7e83bdd7f317a815c6073736be4f4a83c95037a8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/serial/opticon.c    | 4 ++--
 trunk/drivers/usb/serial/usb-serial.c | 1 -
 trunk/include/linux/usb/serial.h      | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fe2f5aef83bf..e45a27a62120 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1108a63e10d344284011cccc06328b2cd3e5da3
+refs/heads/master: 82fc5943430e3cbf15033ed4186a73f90906345d
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
index 80f59b6350cb..c03fdc0242dd 100644
--- a/trunk/drivers/usb/serial/opticon.c
+++ b/trunk/drivers/usb/serial/opticon.c
@@ -501,12 +501,12 @@ static int opticon_resume(struct usb_interface *intf)
 	struct usb_serial_port *port = serial->port[0];
 	int result;
 
-	mutex_lock(&port->mutex);
+	mutex_lock(&port->port.mutex);
 	if (port->port.count)
 		result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO);
 	else
 		result = 0;
-	mutex_unlock(&port->mutex);
+	mutex_unlock(&port->port.mutex);
 	return result;
 }
 
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 829a46684e1d..4543f359be75 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -897,7 +897,6 @@ int usb_serial_probe(struct usb_interface *interface,
 		spin_lock_init(&port->lock);
 		/* Keep this for private driver use for the moment but
 		   should probably go away */
-		mutex_init(&port->mutex);
 		INIT_WORK(&port->work, usb_serial_port_work);
 		serial->port[i] = port;
 		port->dev.parent = &interface->dev;
diff --git a/trunk/include/linux/usb/serial.h b/trunk/include/linux/usb/serial.h
index ce911ebf91e8..acf6e457c04b 100644
--- a/trunk/include/linux/usb/serial.h
+++ b/trunk/include/linux/usb/serial.h
@@ -39,8 +39,6 @@ enum port_dev_state {
  * @serial: pointer back to the struct usb_serial owner of this port.
  * @port: pointer to the corresponding tty_port for this port.
  * @lock: spinlock to grab when updating portions of this structure.
- * @mutex: mutex used to synchronize serial_open() and serial_close()
- *	access for this port.
  * @number: the number of the port (the minor number).
  * @interrupt_in_buffer: pointer to the interrupt in buffer for this port.
  * @interrupt_in_urb: pointer to the interrupt in struct urb for this port.
@@ -77,7 +75,6 @@ struct usb_serial_port {
 	struct usb_serial	*serial;
 	struct tty_port		port;
 	spinlock_t		lock;
-	struct mutex            mutex;
 	unsigned char		number;
 
 	unsigned char		*interrupt_in_buffer;