media: vim2m: Fix abort issue

[sfrench/cifs-2.6.git] / drivers / media / platform / vim2m.c

diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index acd3bd48c7e216eaad1dc7343fe3df9bdaac0caf..e17792f837f8296cd0b195efc6ba971d05729efa 100644 (file)
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -1073,6 +1073,9 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned int count)
        if (!q_data)
                return -EINVAL;
 
+       if (V4L2_TYPE_IS_OUTPUT(q->type))
+               ctx->aborting = 0;
+
        q_data->sequence = 0;
        return 0;
 }
@@ -1343,6 +1346,7 @@ static int vim2m_probe(struct platform_device *pdev)
        if (IS_ERR(dev->m2m_dev)) {
                v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem device\n");
                ret = PTR_ERR(dev->m2m_dev);
+               dev->m2m_dev = NULL;
                goto error_dev;
        }