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
This commit is contained in:
commit
bec41d5b84
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue