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

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

diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index d36f34e..010ed6d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -162,6 +162,7 @@ static void iowarrior_callback(struct urb *urb)
        int offset;
        int status = urb->status;
        int retval;
+       unsigned long flags;
 
        switch (status) {
        case 0:
@@ -175,7 +176,7 @@ static void iowarrior_callback(struct urb *urb)
                goto exit;
        }
 
-       spin_lock(&dev->intr_idx_lock);
+       spin_lock_irqsave(&dev->intr_idx_lock, flags);
        intr_idx = atomic_read(&dev->intr_idx);
        /* aux_idx become previous intr_idx */
        aux_idx = (intr_idx == 0) ? (MAX_INTERRUPT_BUFFER - 1) : (intr_idx - 1);
@@ -211,7 +212,7 @@ static void iowarrior_callback(struct urb *urb)
        *(dev->read_queue + offset + (dev->report_size)) = dev->serial_number++;
 
        atomic_set(&dev->intr_idx, aux_idx);
-       spin_unlock(&dev->intr_idx_lock);
+       spin_unlock_irqrestore(&dev->intr_idx_lock, flags);
        /* tell the blocking read about the new data */
        wake_up_interruptible(&dev->read_wait);
 
-- 
1.7.9.5

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

Reply via email to