aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/opticon.c4
-rw-r--r--drivers/usb/serial/usb-serial.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 80f59b6350cb..c03fdc0242dd 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -501,12 +501,12 @@ static int opticon_resume(struct usb_interface *intf)
501 struct usb_serial_port *port = serial->port[0]; 501 struct usb_serial_port *port = serial->port[0];
502 int result; 502 int result;
503 503
504 mutex_lock(&port->mutex); 504 mutex_lock(&port->port.mutex);
505 if (port->port.count) 505 if (port->port.count)
506 result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO); 506 result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO);
507 else 507 else
508 result = 0; 508 result = 0;
509 mutex_unlock(&port->mutex); 509 mutex_unlock(&port->port.mutex);
510 return result; 510 return result;
511} 511}
512 512
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 829a46684e1d..4543f359be75 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -897,7 +897,6 @@ int usb_serial_probe(struct usb_interface *interface,
897 spin_lock_init(&port->lock); 897 spin_lock_init(&port->lock);
898 /* Keep this for private driver use for the moment but 898 /* Keep this for private driver use for the moment but
899 should probably go away */ 899 should probably go away */
900 mutex_init(&port->mutex);
901 INIT_WORK(&port->work, usb_serial_port_work); 900 INIT_WORK(&port->work, usb_serial_port_work);
902 serial->port[i] = port; 901 serial->port[i] = port;
903 port->dev.parent = &interface->dev; 902 port->dev.parent = &interface->dev;