]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
USB: serial: mos7720: use irqsave() in USB's complete callback
authorJohn Ogness <john.ogness@linutronix.de>
Sat, 23 Jun 2018 22:32:08 +0000 (00:32 +0200)
committerJohan Hovold <johan@kernel.org>
Tue, 26 Jun 2018 12:45:35 +0000 (14:45 +0200)
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>
drivers/usb/serial/mos7720.c

index bd57630e67e2bbd2fcb26ede6b834a6074f88fbf..8f11e759ad61d529870db8b45e74ad6257ebeb65 100644 (file)
@@ -340,14 +340,15 @@ static void async_complete(struct urb *urb)
 {
        struct urbtracker *urbtrack = urb->context;
        int status = urb->status;
+       unsigned long flags;
 
        if (unlikely(status))
                dev_dbg(&urb->dev->dev, "%s - nonzero urb status received: %d\n", __func__, status);
 
        /* remove the urbtracker from the active_urbs list */
-       spin_lock(&urbtrack->mos_parport->listlock);
+       spin_lock_irqsave(&urbtrack->mos_parport->listlock, flags);
        list_del(&urbtrack->urblist_entry);
-       spin_unlock(&urbtrack->mos_parport->listlock);
+       spin_unlock_irqrestore(&urbtrack->mos_parport->listlock, flags);
        kref_put(&urbtrack->ref_count, destroy_urbtracker);
 }