[media] vb2: stop_streaming should return void

[deliverable/linux.git] / drivers / media / platform / davinci / vpif_display.c

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index aed41edd050102e89248cecbb2607a4f45e6eb12..d03487fb1888b201f918fd9059ce2f6b4e01a905 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -308,7 +308,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 }
 
 /* abort streaming and wait for last buffer */
-static int vpif_stop_streaming(struct vb2_queue *vq)
+static void vpif_stop_streaming(struct vb2_queue *vq)
 {
        struct vpif_fh *fh = vb2_get_drv_priv(vq);
        struct channel_obj *ch = fh->channel;
@@ -316,7 +316,7 @@ static int vpif_stop_streaming(struct vb2_queue *vq)
        unsigned long flags;
 
        if (!vb2_is_streaming(vq))
-               return 0;
+               return;
 
        common = &ch->common[VPIF_VIDEO_INDEX];
 
@@ -352,8 +352,6 @@ static int vpif_stop_streaming(struct vb2_queue *vq)
                vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&common->irqlock, flags);
-
-       return 0;
 }
 
 static struct vb2_ops video_qops = {