usb: usbfs: 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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 476dcc5f2da3c3258b2635ab406d09acbd692966..6ce77b33da61302281dd1c49284e457ff04b73bd 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -585,9 +585,10 @@ static void async_completed(struct urb *urb)
        struct siginfo sinfo;
        struct pid *pid = NULL;
        const struct cred *cred = NULL;
+       unsigned long flags;
        int signr;
 
-       spin_lock(&ps->lock);
+       spin_lock_irqsave(&ps->lock, flags);
        list_move_tail(&as->asynclist, &ps->async_completed);
        as->status = urb->status;
        signr = as->signr;
@@ -611,7 +612,7 @@ static void async_completed(struct urb *urb)
                cancel_bulk_urbs(ps, as->bulk_addr);
 
        wake_up(&ps->wait);
-       spin_unlock(&ps->lock);
+       spin_unlock_irqrestore(&ps->lock, flags);
 
        if (signr) {
                kill_pid_info_as_cred(sinfo.si_signo, &sinfo, pid, cred);