Commit bec41d5b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'v4l_for_linus' of git://

* 'v4l_for_linus' of git://
  [media] v4l: soc-camera: fix multiple simultaneous user case
parents 92a8cd42 24d8c029
......@@ -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);
return 0;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment