summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ogness2018-06-24 00:32:09 +0200
committerJohan Hovold2018-06-26 14:49:34 +0200
commit19bfbf462e8921d8e520bcc0a23ebc4988223631 (patch)
tree2fa61bcfb9c45448073d34e530f8b65f9c7534bd
parentUSB: serial: mos7720: use irqsave() in USB's complete callback (diff)
downloadkernel-qcow2-linux-19bfbf462e8921d8e520bcc0a23ebc4988223631.tar.gz
kernel-qcow2-linux-19bfbf462e8921d8e520bcc0a23ebc4988223631.tar.xz
kernel-qcow2-linux-19bfbf462e8921d8e520bcc0a23ebc4988223631.zip
USB: serial: mos7840: use irqsave() in USB's complete callback
The USB completion callback does not disable interrupts while acquiring the lock. We want to remove the local_irq_disable() invocation from __usb_hcd_giveback_urb() and therefore it is required for the callback handler to disable the interrupts while acquiring the lock. The callback may be invoked either in IRQ or BH context depending on the USB host controller. Use the _irqsave() variant of the locking primitives. Signed-off-by: John Ogness <john.ogness@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r--drivers/usb/serial/mos7840.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index fdceb46d9fc6..4efffbbef5ae 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -802,18 +802,19 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)
struct moschip_port *mos7840_port;
struct usb_serial_port *port;
int status = urb->status;
+ unsigned long flags;
int i;
mos7840_port = urb->context;
port = mos7840_port->port;
- spin_lock(&mos7840_port->pool_lock);
+ spin_lock_irqsave(&mos7840_port->pool_lock, flags);
for (i = 0; i < NUM_URBS; i++) {
if (urb == mos7840_port->write_urb_pool[i]) {
mos7840_port->busy[i] = 0;
break;
}
}
- spin_unlock(&mos7840_port->pool_lock);
+ spin_unlock_irqrestore(&mos7840_port->pool_lock, flags);
if (status) {
dev_dbg(&port->dev, "nonzero write bulk status received:%d\n", status);