From: Dan Carpenter Date: Wed, 18 Dec 2013 07:29:24 +0000 (-0300) Subject: [media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next() X-Git-Tag: v3.14-rc1~20^2~195 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f7d40eea8e3e531f1517ab7eded552e8837ef5da;p=~emulex%2Finfiniband.git [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 Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 482b72fb819..8c7f35029cd 100644 --- 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,