diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 11:23:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 11:23:30 -0800 |
| commit | bec41d5b8417ccb98e4752affa24e1dc563d99f9 (patch) | |
| tree | acabb52f1431c10d523f86b8180adffe2a152295 /drivers/media | |
| parent | 92a8cd42673f119896df7e964976c18952eb9970 (diff) | |
| parent | 24d8c0293b04ad207648bb2a0dbfebff8b47d166 (diff) | |
| download | op-kernel-dev-bec41d5b8417ccb98e4752affa24e1dc563d99f9.zip op-kernel-dev-bec41d5b8417ccb98e4752affa24e1dc563d99f9.tar.gz | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] v4l: soc-camera: fix multiple simultaneous user case
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 335120c..052bd6d 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file) ret = soc_camera_set_fmt(icd, &f); if (ret < 0) goto esfmt; + + ici->ops->init_videobuf(&icd->vb_vidq, icd); } file->private_data = icd; dev_dbg(&icd->dev, "camera device open\n"); - ici->ops->init_videobuf(&icd->vb_vidq, icd); - mutex_unlock(&icd->video_lock); return 0; |
