[media] gspca: always call v4l2_ctrl_handler_setup after start

This ensures the controls are setup correctly.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index e934393cd806..06274871b783 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1235,10 +1235,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         if (sd->sensor == SENSOR_OV971x)
                 return gspca_dev->usb_err;
-        else if (sd->sensor == SENSOR_OV562x) {
-                v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
+        if (sd->sensor == SENSOR_OV562x)
                 return gspca_dev->usb_err;
-        }
+
         switch (gspca_dev->curr_mode) {
         case QVGA_MODE:                 /* 320x240 */
                 sccb_w_array(gspca_dev, ov965x_start_1_vga,
@@ -1283,8 +1282,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
-
         reg_w(gspca_dev, 0xe0, 0x00);
         reg_w(gspca_dev, 0xe0, 0x00);
         set_led(gspca_dev, 1);