[PATCH v1 09/49] USB: ldusb: prepare for enabling irq in complete()

[Ming Lei]

Complete() will be run with interrupt enabled, so change to
spin_lock_irqsave().

Signed-off-by: Ming Lei <ming....@canonical.com>
---
 drivers/usb/misc/ldusb.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index b1d5953..76ab55a 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -236,6 +236,7 @@ static void ld_usb_interrupt_in_callback(struct urb *urb)
        unsigned int next_ring_head;
        int status = urb->status;
        int retval;
+       unsigned long flags;
 
        if (status) {
                if (status == -ENOENT ||
@@ -246,12 +247,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) {
@@ -280,7 +281,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);
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html