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/gspca.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/gspca.c')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index b4fd548..7bb23a9 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -930,6 +930,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev) goto out; } gspca_dev->streaming = 1; + v4l2_ctrl_handler_setup(gspca_dev->vdev.ctrl_handler); /* some bulk transfers are started by the subdriver */ if (gspca_dev->cam.bulk && gspca_dev->cam.bulk_nurbs == 0) @@ -2428,7 +2429,6 @@ int gspca_resume(struct usb_interface *intf) */ streaming = gspca_dev->streaming; gspca_dev->streaming = 0; - v4l2_ctrl_handler_setup(gspca_dev->vdev.ctrl_handler); if (streaming) ret = gspca_init_transfer(gspca_dev); mutex_unlock(&gspca_dev->usb_lock); |
