[media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next()

The spin_lock_irqsave() macro is not nestable.  The second call will
overwrite the first record of "flags" so the IRQs will not be enabled
correctly at the end of the function.

In the current code, this function is always called from the IRQ handler
so everything works fine and this fix doesn't change anything.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 482b72fb819fb373325414018d7e5d80ea590cb3..8c7f35029cd54446e5a5e944086e8d846f925caf 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -476,9 +476,9 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
        }
 
        if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->input != NULL) {
-               spin_lock_irqsave(&pipe->lock, flags);
+               spin_lock(&pipe->lock);
                pipe->state &= ~ISS_PIPELINE_STREAM;
-               spin_unlock_irqrestore(&pipe->lock, flags);
+               spin_unlock(&pipe->lock);
        }
 
        buf = list_first_entry(&video->dmaqueue, struct iss_buffer,