diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2014-03-18 06:41:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 11:14:49 -0400 |
commit | 691903f932c5feafc149e2877478ef26b198eddb (patch) | |
tree | 7287b0e589e92f1a5846d0ab4758332a6d72f872 | |
parent | 25c61e4cfc2fc69d62cc07befc075a2883b047a1 (diff) |
[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<archit@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/platform/ti-vpe/csc.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/ti-vpe/sc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c index acfea500710e..3374e0490cb0 100644 --- a/drivers/media/platform/ti-vpe/csc.c +++ b/drivers/media/platform/ti-vpe/csc.c | |||
@@ -187,9 +187,9 @@ struct csc_data *csc_create(struct platform_device *pdev) | |||
187 | } | 187 | } |
188 | 188 | ||
189 | csc->base = devm_ioremap_resource(&pdev->dev, csc->res); | 189 | csc->base = devm_ioremap_resource(&pdev->dev, csc->res); |
190 | if (!csc->base) { | 190 | if (IS_ERR(csc->base)) { |
191 | dev_err(&pdev->dev, "failed to ioremap\n"); | 191 | dev_err(&pdev->dev, "failed to ioremap\n"); |
192 | return ERR_PTR(-ENOMEM); | 192 | return csc->base; |
193 | } | 193 | } |
194 | 194 | ||
195 | return csc; | 195 | return csc; |
diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c index 93f0af546b76..6314171ffe9b 100644 --- a/drivers/media/platform/ti-vpe/sc.c +++ b/drivers/media/platform/ti-vpe/sc.c | |||
@@ -302,9 +302,9 @@ struct sc_data *sc_create(struct platform_device *pdev) | |||
302 | } | 302 | } |
303 | 303 | ||
304 | sc->base = devm_ioremap_resource(&pdev->dev, sc->res); | 304 | sc->base = devm_ioremap_resource(&pdev->dev, sc->res); |
305 | if (!sc->base) { | 305 | if (IS_ERR(sc->base)) { |
306 | dev_err(&pdev->dev, "failed to ioremap\n"); | 306 | dev_err(&pdev->dev, "failed to ioremap\n"); |
307 | return ERR_PTR(-ENOMEM); | 307 | return sc->base; |
308 | } | 308 | } |
309 | 309 | ||
310 | return sc; | 310 | return sc; |