aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/s2255/s2255drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/s2255/s2255drv.c')
-rw-r--r--drivers/media/usb/s2255/s2255drv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 1d4ba2b80490..e019dd63ed42 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -714,7 +714,7 @@ static void buffer_queue(struct vb2_buffer *vb)
714} 714}
715 715
716static int start_streaming(struct vb2_queue *vq, unsigned int count); 716static int start_streaming(struct vb2_queue *vq, unsigned int count);
717static int stop_streaming(struct vb2_queue *vq); 717static void stop_streaming(struct vb2_queue *vq);
718 718
719static struct vb2_ops s2255_video_qops = { 719static struct vb2_ops s2255_video_qops = {
720 .queue_setup = queue_setup, 720 .queue_setup = queue_setup,
@@ -1109,7 +1109,7 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
1109} 1109}
1110 1110
1111/* abort streaming and wait for last buffer */ 1111/* abort streaming and wait for last buffer */
1112static int stop_streaming(struct vb2_queue *vq) 1112static void stop_streaming(struct vb2_queue *vq)
1113{ 1113{
1114 struct s2255_vc *vc = vb2_get_drv_priv(vq); 1114 struct s2255_vc *vc = vb2_get_drv_priv(vq);
1115 struct s2255_buffer *buf, *node; 1115 struct s2255_buffer *buf, *node;
@@ -1123,7 +1123,6 @@ static int stop_streaming(struct vb2_queue *vq)
1123 buf, buf->vb.v4l2_buf.index); 1123 buf, buf->vb.v4l2_buf.index);
1124 } 1124 }
1125 spin_unlock_irqrestore(&vc->qlock, flags); 1125 spin_unlock_irqrestore(&vc->qlock, flags);
1126 return 0;
1127} 1126}
1128 1127
1129static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id i) 1128static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id i)