usb: ldusb: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index c2e255f02a72b822b0d4fe996968abff9477fc5a..006762b72ff54211f05fed030170bc7f1a70448d 100644 (file)
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -225,6 +225,7 @@ static void ld_usb_interrupt_in_callback(struct urb *urb)
        size_t *actual_buffer;
        unsigned int next_ring_head;
        int status = urb->status;
+       unsigned long flags;
        int retval;
 
        if (status) {
@@ -236,12 +237,12 @@ static void ld_usb_interrupt_in_callback(struct urb *urb)
                        dev_dbg(&dev->intf->dev,
                                "%s: nonzero status received: %d\n", __func__,
                                status);
-                       spin_lock(&dev->rbsl);
+                       spin_lock_irqsave(&dev->rbsl, flags);
                        goto resubmit; /* maybe we can recover */
                }
        }
 
-       spin_lock(&dev->rbsl);
+       spin_lock_irqsave(&dev->rbsl, flags);
        if (urb->actual_length > 0) {
                next_ring_head = (dev->ring_head+1) % ring_buffer_size;
                if (next_ring_head != dev->ring_tail) {
@@ -270,7 +271,7 @@ resubmit:
                        dev->buffer_overflow = 1;
                }
        }
-       spin_unlock(&dev->rbsl);
+       spin_unlock_irqrestore(&dev->rbsl, flags);
 exit:
        dev->interrupt_in_done = 1;
        wake_up_interruptible(&dev->read_wait);