diff options
| author | Dan Carpenter | 2013-12-18 08:29:24 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-01-02 18:53:01 +0100 |
| commit | f7d40eea8e3e531f1517ab7eded552e8837ef5da (patch) | |
| tree | 51eb1954d877f28537f0c39a0a1fa98b6c263894 /drivers/staging/media/omap4iss/iss_video.c | |
| parent | [media] v4l: omap4iss: use snprintf() to make smatch happy (diff) | |
| download | kernel-qcow2-linux-f7d40eea8e3e531f1517ab7eded552e8837ef5da.tar.gz kernel-qcow2-linux-f7d40eea8e3e531f1517ab7eded552e8837ef5da.tar.xz kernel-qcow2-linux-f7d40eea8e3e531f1517ab7eded552e8837ef5da.zip | |
[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>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_video.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 482b72fb819f..8c7f35029cd5 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, |