1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 8b16152f52fe..e05d1c7fee8d 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -482,7 +482,7 @@ static int soc_camera_open(struct file *file)
         struct soc_camera_host *ici;
         int ret;
 
-        if (!icd->ops)
+        if (!to_soc_camera_control(icd))
                 /* No device driver attached */
                 return -ENODEV;
 
@@ -835,6 +835,9 @@ static int soc_camera_queryctrl(struct file *file, void *priv,
                         return 0;
                 }
 
+        if (!icd->ops)
+                return -EINVAL;
+
         /* Then device controls */
         for (i = 0; i < icd->ops->num_controls; i++)
                 if (qc->id == icd->ops->controls[i].id) {
@@ -1461,11 +1464,6 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
         if (!icd->parent)
                 return -ENODEV;
 
-        if (!icd->ops ||
-            !icd->ops->query_bus_param ||
-            !icd->ops->set_bus_param)
-                return -EINVAL;
-
         ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
         if (ret < 0) {
                 dev_err(icd->pdev, "video_register_device failed: %d\n", ret);