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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 335120c2021b..052bd6dfa5a7 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;