summaryrefslogtreecommitdiff
path: root/drivers/media/video/gspca/vc032x.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-06-15 12:24:26 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-31 01:37:25 +0400
commit82b343b231e0e29bc5d88998943cc4fd2fb61598 (patch)
tree6c51a992ef8189cc732f4bb43cf4f226f2195fa0 /drivers/media/video/gspca/vc032x.c
parentac3322b0d400fdbab410ab80f26a501c2e169e5d (diff)
downloadlinux-82b343b231e0e29bc5d88998943cc4fd2fb61598.tar.xz
[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>
Diffstat (limited to 'drivers/media/video/gspca/vc032x.c')
-rw-r--r--drivers/media/video/gspca/vc032x.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index ee1a1c558e48..54a6cf92b745 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -3543,7 +3543,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
/* case SENSOR_POxxxx: */
usb_exchange(gspca_dev, poxxxx_init_common);
setgamma(gspca_dev);
- v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
usb_exchange(gspca_dev, poxxxx_init_start_3);
if (mode)
init = poxxxx_initQVGA;
@@ -3576,7 +3575,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
break;
}
msleep(100);
- v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
}
switch (sd->sensor) {
case SENSOR_OV7670: