summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart2014-06-04 00:23:16 +0200
committerMauro Carvalho Chehab2014-07-17 21:20:50 +0200
commit2b44ac9e84d583c0e25b22bd0809d9ddf0c54f6f (patch)
tree78476f0cfee93b8a9701929496ddd8b0f2c450f6
parent[media] v4l: omap4iss: Copy paste error in iss_get_clocks (diff)
downloadkernel-qcow2-linux-2b44ac9e84d583c0e25b22bd0809d9ddf0c54f6f.tar.gz
kernel-qcow2-linux-2b44ac9e84d583c0e25b22bd0809d9ddf0c54f6f.tar.xz
kernel-qcow2-linux-2b44ac9e84d583c0e25b22bd0809d9ddf0c54f6f.zip
[media] v4l: omap4iss: Don't reinitialize the video qlock at every streamon
Initialize the spin lock once only when initializing the video object. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/omap4iss/iss_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index cbf455d66f73..56942dffe2ff 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -895,7 +895,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
video->queue = &vfh->queue;
INIT_LIST_HEAD(&video->dmaqueue);
- spin_lock_init(&video->qlock);
video->error = false;
atomic_set(&pipe->frame_number, -1);
@@ -1175,6 +1174,7 @@ int omap4iss_video_init(struct iss_video *video, const char *name)
if (ret < 0)
return ret;
+ spin_lock_init(&video->qlock);
mutex_init(&video->mutex);
atomic_set(&video->active, 0);