1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 43848a751d11..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;
@@ -896,7 +896,7 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd,
         icl->board_info->platform_data = icd;
 
         subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap,
-                                NULL, icl->board_info, NULL);
+                                icl->board_info, NULL);
         if (!subdev)
                 goto ei2cnd;