]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] coda: fix error return value if v4l2_m2m_ctx_init fails
authorPhilipp Zabel <p.zabel@pengutronix.de>
Tue, 21 May 2013 13:31:25 +0000 (10:31 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 27 May 2013 12:32:57 +0000 (09:32 -0300)
Use ret from the outer scope, instead of redefining it in the
conditional clause. That way the error value reaches the end of
the function as intended.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/coda.c

index b1f77d3c85941c80de5668aebef03b795376f73b..aebd17251ba22fb092bc0c8a6c3246c67b8eab5f 100644 (file)
@@ -1484,7 +1484,7 @@ static int coda_open(struct file *file)
        ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx,
                                         &coda_queue_init);
        if (IS_ERR(ctx->m2m_ctx)) {
-               int ret = PTR_ERR(ctx->m2m_ctx);
+               ret = PTR_ERR(ctx->m2m_ctx);
 
                v4l2_err(&dev->v4l2_dev, "%s return error (%d)\n",
                         __func__, ret);