diff options
Diffstat (limited to 'drivers/media/usb/pwc/pwc-if.c')
-rw-r--r-- | drivers/media/usb/pwc/pwc-if.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 84a6720b1d00..a73b0bced96f 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c | |||
@@ -681,12 +681,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) | |||
681 | return r; | 681 | return r; |
682 | } | 682 | } |
683 | 683 | ||
684 | static int stop_streaming(struct vb2_queue *vq) | 684 | static void stop_streaming(struct vb2_queue *vq) |
685 | { | 685 | { |
686 | struct pwc_device *pdev = vb2_get_drv_priv(vq); | 686 | struct pwc_device *pdev = vb2_get_drv_priv(vq); |
687 | 687 | ||
688 | if (mutex_lock_interruptible(&pdev->v4l2_lock)) | 688 | mutex_lock(&pdev->v4l2_lock); |
689 | return -ERESTARTSYS; | ||
690 | if (pdev->udev) { | 689 | if (pdev->udev) { |
691 | pwc_set_leds(pdev, 0, 0); | 690 | pwc_set_leds(pdev, 0, 0); |
692 | pwc_camera_power(pdev, 0); | 691 | pwc_camera_power(pdev, 0); |
@@ -695,8 +694,6 @@ static int stop_streaming(struct vb2_queue *vq) | |||
695 | 694 | ||
696 | pwc_cleanup_queued_bufs(pdev); | 695 | pwc_cleanup_queued_bufs(pdev); |
697 | mutex_unlock(&pdev->v4l2_lock); | 696 | mutex_unlock(&pdev->v4l2_lock); |
698 | |||
699 | return 0; | ||
700 | } | 697 | } |
701 | 698 | ||
702 | static struct vb2_ops pwc_vb_queue_ops = { | 699 | static struct vb2_ops pwc_vb_queue_ops = { |