diff options
Diffstat (limited to 'drivers/media/video/gspca/ov534_9.c')
-rw-r--r-- | drivers/media/video/gspca/ov534_9.c | 7 |
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) | |||
1235 | 1235 | ||
1236 | if (sd->sensor == SENSOR_OV971x) | 1236 | if (sd->sensor == SENSOR_OV971x) |
1237 | return gspca_dev->usb_err; | 1237 | return gspca_dev->usb_err; |
1238 | else if (sd->sensor == SENSOR_OV562x) { | 1238 | if (sd->sensor == SENSOR_OV562x) |
1239 | v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler); | ||
1240 | return gspca_dev->usb_err; | 1239 | return gspca_dev->usb_err; |
1241 | } | 1240 | |
1242 | switch (gspca_dev->curr_mode) { | 1241 | switch (gspca_dev->curr_mode) { |
1243 | case QVGA_MODE: /* 320x240 */ | 1242 | case QVGA_MODE: /* 320x240 */ |
1244 | sccb_w_array(gspca_dev, ov965x_start_1_vga, | 1243 | sccb_w_array(gspca_dev, ov965x_start_1_vga, |
@@ -1283,8 +1282,6 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
1283 | break; | 1282 | break; |
1284 | } | 1283 | } |
1285 | 1284 | ||
1286 | v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler); | ||
1287 | |||
1288 | reg_w(gspca_dev, 0xe0, 0x00); | 1285 | reg_w(gspca_dev, 0xe0, 0x00); |
1289 | reg_w(gspca_dev, 0xe0, 0x00); | 1286 | reg_w(gspca_dev, 0xe0, 0x00); |
1290 | set_led(gspca_dev, 1); | 1287 | set_led(gspca_dev, 1); |