mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Cc: Alan Stern <[email protected]> Cc: Oliver Neukum <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
e1108a63e1
commit
82fc594343
3 changed files with 2 additions and 6 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue