[PATCH 04/50] USB: adutux: spin_lock in complete() cleanup

[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 eb3c8c1..387c75e 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -195,12 +195,13 @@ static void adu_interrupt_in_callback(struct urb *urb)
 {
        struct adu_device *dev = urb->context;
        int status = urb->status;
+       unsigned long flags;
 
        dbg(4, " %s : enter, status %d", __func__, status);
        adu_debug_data(5, __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) &&
@@ -229,7 +230,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);
        adu_debug_data(5, __func__, urb->actual_length,
@@ -241,6 +242,7 @@ static void adu_interrupt_out_callback(struct urb *urb)
 {
        struct adu_device *dev = urb->context;
        int status = urb->status;
+       unsigned long flags;
 
        dbg(4, " %s : enter, status %d", __func__, status);
        adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
@@ -254,10 +256,10 @@ static void adu_interrupt_out_callback(struct urb *urb)
                goto exit;
        }
 
-       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);
 exit:
 
        adu_debug_data(5, __func__, urb->actual_length,
-- 
1.7.9.5

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