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

[Ming Lei]

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

Cc: Lisa Nguyen <l...@xenapiadmin.com>
Signed-off-by: Ming Lei <ming....@canonical.com>
---
 drivers/usb/misc/adutux.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 3eaa83f..a30efb8 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -159,11 +159,12 @@ static void adu_interrupt_in_callback(struct urb *urb)
 {
        struct adu_device *dev = urb->context;
        int status = urb->status;
+       unsigned long flags;
 
        adu_debug_data(&dev->udev->dev, __func__,
                       urb->actual_length, urb->transfer_buffer);
 
-       spin_lock(&dev->buflock);
+       spin_lock_irqsave(&dev->buflock, flags);
 
        if (status != 0) {
                if ((status != -ENOENT) && (status != -ECONNRESET) &&
@@ -194,7 +195,7 @@ static void adu_interrupt_in_callback(struct urb *urb)
 
 exit:
        dev->read_urb_finished = 1;
-       spin_unlock(&dev->buflock);
+       spin_unlock_irqrestore(&dev->buflock, flags);
        /* always wake up so we recover from errors */
        wake_up_interruptible(&dev->read_wait);
 }
@@ -203,6 +204,7 @@ static void adu_interrupt_out_callback(struct urb *urb)
 {
        struct adu_device *dev = urb->context;
        int status = urb->status;
+       unsigned long flags;
 
        adu_debug_data(&dev->udev->dev, __func__,
                       urb->actual_length, urb->transfer_buffer);
@@ -217,10 +219,10 @@ static void adu_interrupt_out_callback(struct urb *urb)
                return;
        }
 
-       spin_lock(&dev->buflock);
+       spin_lock_irqsave(&dev->buflock, flags);
        dev->out_urb_finished = 1;
        wake_up(&dev->write_wait);
-       spin_unlock(&dev->buflock);
+       spin_unlock_irqrestore(&dev->buflock, flags);
 }
 
 static int adu_open(struct inode *inode, struct file *file)
-- 
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