diff options
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/pwc/pwc-if.c | 4 | ||||
| -rw-r--r-- | drivers/media/usb/uvc/uvc_queue.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 8bef0152b1ce..1a27096b3f91 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c | |||
| @@ -614,7 +614,7 @@ static int buffer_prepare(struct vb2_buffer *vb) | |||
| 614 | return 0; | 614 | return 0; |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | static int buffer_finish(struct vb2_buffer *vb) | 617 | static void buffer_finish(struct vb2_buffer *vb) |
| 618 | { | 618 | { |
| 619 | struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue); | 619 | struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue); |
| 620 | struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb); | 620 | struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb); |
| @@ -624,7 +624,7 @@ static int buffer_finish(struct vb2_buffer *vb) | |||
| 624 | * filled, take the pwc data we've stored in buf->data and decompress | 624 | * filled, take the pwc data we've stored in buf->data and decompress |
| 625 | * it into a usable format, storing the result in the vb2_buffer | 625 | * it into a usable format, storing the result in the vb2_buffer |
| 626 | */ | 626 | */ |
| 627 | return pwc_decompress(pdev, buf); | 627 | pwc_decompress(pdev, buf); |
| 628 | } | 628 | } |
| 629 | 629 | ||
| 630 | static void buffer_cleanup(struct vb2_buffer *vb) | 630 | static void buffer_cleanup(struct vb2_buffer *vb) |
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index 935556e88ca5..26172cbcf096 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c | |||
| @@ -106,7 +106,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb) | |||
| 106 | spin_unlock_irqrestore(&queue->irqlock, flags); | 106 | spin_unlock_irqrestore(&queue->irqlock, flags); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | static int uvc_buffer_finish(struct vb2_buffer *vb) | 109 | static void uvc_buffer_finish(struct vb2_buffer *vb) |
| 110 | { | 110 | { |
| 111 | struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue); | 111 | struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue); |
| 112 | struct uvc_streaming *stream = | 112 | struct uvc_streaming *stream = |
| @@ -114,7 +114,6 @@ static int uvc_buffer_finish(struct vb2_buffer *vb) | |||
| 114 | struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf); | 114 | struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf); |
| 115 | 115 | ||
| 116 | uvc_video_clock_update(stream, &vb->v4l2_buf, buf); | 116 | uvc_video_clock_update(stream, &vb->v4l2_buf, buf); |
| 117 | return 0; | ||
| 118 | } | 117 | } |
| 119 | 118 | ||
| 120 | static void uvc_wait_prepare(struct vb2_queue *vq) | 119 | static void uvc_wait_prepare(struct vb2_queue *vq) |
