aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/opticon.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-06 11:06:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 18:18:04 -0500
commit82fc5943430e3cbf15033ed4186a73f90906345d (patch)
tree16e8168424072f02cba69c64bedf5d52915c9eda /drivers/usb/serial/opticon.c
parente1108a63e10d344284011cccc06328b2cd3e5da3 (diff)
usb_serial: Kill port mutex
The tty port has a port mutex used for all the port related locking so we don't need the one in the USB serial layer any more. Signed-off-by: Alan Cox <alan@linux.intel.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
-rw-r--r--drivers/usb/serial/opticon.c4
1 files changed, 2 insertions, 2 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