Merge tag 'md/3.16' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / mem2mem_testdev.c

diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 4f3096b170665e15329c25035248b207d3b7d276..0714070ed7fab4ea5fd90597c1c130979c486916 100644 (file)
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -787,7 +787,7 @@ static int m2mtest_start_streaming(struct vb2_queue *q, unsigned count)
        return 0;
 }
 
-static int m2mtest_stop_streaming(struct vb2_queue *q)
+static void m2mtest_stop_streaming(struct vb2_queue *q)
 {
        struct m2mtest_ctx *ctx = vb2_get_drv_priv(q);
        struct vb2_buffer *vb;
@@ -799,12 +799,11 @@ static int m2mtest_stop_streaming(struct vb2_queue *q)
                else
                        vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
                if (vb == NULL)
-                       return 0;
+                       return;
                spin_lock_irqsave(&ctx->dev->irqlock, flags);
                v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR);
                spin_unlock_irqrestore(&ctx->dev->irqlock, flags);
        }
-       return 0;
 }
 
 static struct vb2_ops m2mtest_qops = {