evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: f81232: change lock mechanism

Browse source 
The original driver lock with spin_lock_irqsave()/spin_unlock_irqrestore()
because of it's maybe used in interrupt context f81232_process_read_urb().

We had remove it from previous patch "implement RX bulk-in EP", so we can
change it from busying loop spin_lock to sleepable mutex_lock.

Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Peter Hung 2015-03-17 17:48:21 +08:00 • committed by Johan Hovold
parent 8885078949
commit 7139c93285
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/serial/f81232.c
View file

@ -19,7 +19,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/spinlock.h> #include <linux/mutex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/serial.h> #include <linux/usb/serial.h>
@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define UART_CTS 0x80 #define UART_CTS 0x80
struct f81232_private { struct f81232_private {
spinlock_t lock; struct mutex lock;
u8 line_control; u8 line_control;
u8 modem_status; u8 modem_status;
}; };
@ -231,17 +231,16 @@ static void f81232_close(struct usb_serial_port *port)
static void f81232_dtr_rts(struct usb_serial_port *port, int on) static void f81232_dtr_rts(struct usb_serial_port *port, int on)
{ {
struct f81232_private *priv = usb_get_serial_port_data(port); struct f81232_private *priv = usb_get_serial_port_data(port);
unsigned long flags;
u8 control; u8 control;
spin_lock_irqsave(&priv->lock, flags); mutex_lock(&priv->lock);
/* Change DTR and RTS */ /* Change DTR and RTS */
if (on) if (on)
priv->line_control |= (CONTROL_DTR | CONTROL_RTS); priv->line_control |= (CONTROL_DTR | CONTROL_RTS);
else else
priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS); priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS);
control = priv->line_control; control = priv->line_control;
spin_unlock_irqrestore(&priv->lock, flags); mutex_unlock(&priv->lock);
set_control_lines(port->serial->dev, control); set_control_lines(port->serial->dev, control);
} }
@ -285,7 +284,7 @@ static int f81232_port_probe(struct usb_serial_port *port)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&priv->lock); mutex_init(&priv->lock);
usb_set_serial_port_data(port, priv); usb_set_serial_port_data(port, priv);