lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2010-12-28 11:23:30 -08:00
parent 92a8cd4267 24d8c0293b
commit bec41d5b84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/soc_camera.c
View File

@@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file)
ret = soc_camera_set_fmt(icd, &f); ret = soc_camera_set_fmt(icd, &f);
if (ret < 0) if (ret < 0)
goto esfmt; goto esfmt;
ici->ops->init_videobuf(&icd->vb_vidq, icd);
} }
file->private_data = icd; file->private_data = icd;
dev_dbg(&icd->dev, "camera device open\n"); dev_dbg(&icd->dev, "camera device open\n");
ici->ops->init_videobuf(&icd->vb_vidq, icd);
mutex_unlock(&icd->video_lock); mutex_unlock(&icd->video_lock);
return 0; return 0;