aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-tv/mixer_video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/s5p-tv/mixer_video.c')
-rw-r--r--drivers/media/platform/s5p-tv/mixer_video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index a1ce55fd30f3..9f1e52f0bd09 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -985,7 +985,7 @@ static void mxr_watchdog(unsigned long arg)
985 spin_unlock_irqrestore(&layer->enq_slock, flags); 985 spin_unlock_irqrestore(&layer->enq_slock, flags);
986} 986}
987 987
988static int stop_streaming(struct vb2_queue *vq) 988static void stop_streaming(struct vb2_queue *vq)
989{ 989{
990 struct mxr_layer *layer = vb2_get_drv_priv(vq); 990 struct mxr_layer *layer = vb2_get_drv_priv(vq);
991 struct mxr_device *mdev = layer->mdev; 991 struct mxr_device *mdev = layer->mdev;
@@ -1031,7 +1031,6 @@ static int stop_streaming(struct vb2_queue *vq)
1031 mxr_streamer_put(mdev); 1031 mxr_streamer_put(mdev);
1032 /* allow changes in output configuration */ 1032 /* allow changes in output configuration */
1033 mxr_output_put(mdev); 1033 mxr_output_put(mdev);
1034 return 0;
1035} 1034}
1036 1035
1037static struct vb2_ops mxr_video_qops = { 1036static struct vb2_ops mxr_video_qops = {