Thread (71 messages) 71 messages, 8 authors, 2013-07-27

Re: [PATCH 36/50] media: usb: em28xx: spin_lock in complete() cleanup

From: Devin Heitmueller <hidden>
Date: 2013-07-11 12:42:50
Also in: alsa-devel, linux-media, linux-wireless, netdev

On Thu, Jul 11, 2013 at 5:05 AM, Ming Lei [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Complete() will be run with interrupt enabled, so change to
spin_lock_irqsave().

Cc: Mauro Carvalho Chehab <redacted>
Cc: linux-media@vger.kernel.org
Signed-off-by: Ming Lei <redacted>
---
 drivers/media/usb/em28xx/em28xx-core.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index fc157af..0d698f9 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -941,6 +941,7 @@ static void em28xx_irq_callback(struct urb *urb)
 {
        struct em28xx *dev = urb->context;
        int i;
+       unsigned long flags;

        switch (urb->status) {
        case 0:             /* success */
@@ -956,9 +957,9 @@ static void em28xx_irq_callback(struct urb *urb)
        }

        /* Copy data from URB */
-       spin_lock(&dev->slock);
+       spin_lock_irqsave(&dev->slock, flags);
        dev->usb_ctl.urb_data_copy(dev, urb);
-       spin_unlock(&dev->slock);
+       spin_unlock_irqrestore(&dev->slock, flags);

        /* Reset urb buffers */
        for (i = 0; i < urb->number_of_packets; i++) {
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
I actually stumbled across this a couple of weeks ago, and have had an
identical patch running in a local dev tree.

Reviewed-by: Devin Heitmueller <redacted>
Tested-by: Devin Heitmueller <redacted>

-- 
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help