diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-06-15 05:24:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 18:37:25 -0300 |
| commit | 82b343b231e0e29bc5d88998943cc4fd2fb61598 (patch) | |
| tree | 6c51a992ef8189cc732f4bb43cf4f226f2195fa0 /drivers/media/video/gspca/spca505.c | |
| parent | ac3322b0d400fdbab410ab80f26a501c2e169e5d (diff) | |
| download | op-kernel-dev-82b343b231e0e29bc5d88998943cc4fd2fb61598.zip op-kernel-dev-82b343b231e0e29bc5d88998943cc4fd2fb61598.tar.gz | |
[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/spca505.c')
| -rw-r--r-- | drivers/media/video/gspca/spca505.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index a1def07..fea17a8 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c @@ -679,13 +679,9 @@ static int sd_start(struct gspca_dev *gspca_dev) reg_write(dev, SPCA50X_REG_COMPRESS, 0x06, mode_tb[mode][1]); reg_write(dev, SPCA50X_REG_COMPRESS, 0x07, mode_tb[mode][2]); - ret = reg_write(dev, SPCA50X_REG_USB, + return reg_write(dev, SPCA50X_REG_USB, SPCA50X_USB_CTRL, SPCA50X_CUSB_ENABLE); - - v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler); - - return ret; } static void sd_stopN(struct gspca_dev *gspca_dev) |
