Commit 691903f9 authored Mar 18, 2014 by Bartlomiej Zolnierkiewicz Committed by Mauro Carvalho Chehab May 23, 2014

[media] v4l: ti-vpe: fix devm_ioremap_resource() return value checking



devm_ioremap_resource() returns a pointer to the remapped memory or
an ERR_PTR() encoded error code on failure.  Fix the checks inside
csc_create() and sc_create() accordingly.

Cc: Archit Taneja <archit@ti.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Tested-by: Archit <Taneja&lt;archit@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

parent 25c61e4c

drivers/media/platform/ti-vpe/csc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -187,9 +187,9 @@ struct csc_data csc_create(struct platform_device pdev)
		}

		csc->base = devm_ioremap_resource(&pdev->dev, csc->res);
		if (!csc->base) {
		if (IS_ERR(csc->base)) {
		dev_err(&pdev->dev, "failed to ioremap\n");
		return ERR_PTR(-ENOMEM);
		return csc->base;
		}

		return csc;

drivers/media/platform/ti-vpe/sc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -302,9 +302,9 @@ struct sc_data sc_create(struct platform_device pdev)
		}

		sc->base = devm_ioremap_resource(&pdev->dev, sc->res);
		if (!sc->base) {
		if (IS_ERR(sc->base)) {
		dev_err(&pdev->dev, "failed to ioremap\n");
		return ERR_PTR(-ENOMEM);
		return sc->base;
		}

		return sc;