summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/spca1528.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-06-15 10:24:26 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 23:37:25 +0200
commit82b343b231e0e29bc5d88998943cc4fd2fb61598 (patch)
tree6c51a992ef8189cc732f4bb43cf4f226f2195fa0 /drivers/media/video/gspca/spca1528.c
parent[media] gspca: clear priv field and disable relevant ioctls (diff)
downloadlinux-82b343b231e0e29bc5d88998943cc4fd2fb61598.tar.xz
linux-82b343b231e0e29bc5d88998943cc4fd2fb61598.zip
[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/spca1528.c')
-rw-r--r--drivers/media/video/gspca/spca1528.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c
index 315a5bf2034c..fa2075a7e486 100644
--- a/drivers/media/video/gspca/spca1528.c
+++ b/drivers/media/video/gspca/spca1528.c
@@ -261,10 +261,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
/* the JPEG quality shall be 85% */
jpeg_set_qual(sd->jpeg_hdr, 85);
- /* set the controls */
- v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
-
- msleep(5);
reg_r(gspca_dev, 0x00, 0x2520, 1);
msleep(8);