* [PATCH] media: cedrus: Fix a NULL vs IS_ERR() check
@ 2018-11-26 8:10 Dan Carpenter
2018-11-26 8:21 ` Paul Kocialkowski
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2018-11-26 8:10 UTC (permalink / raw)
To: Maxime Ripard, Paul Kocialkowski
Cc: Mauro Carvalho Chehab, Greg Kroah-Hartman, Chen-Yu Tsai,
linux-media, devel, linux-arm-kernel, linux-kernel,
kernel-janitors
The devm_ioremap_resource() function doesn't return NULL pointers, it
returns error pointers.
Fixes: 50e761516f2b ("media: platform: Add Cedrus VPU decoder driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index 32adbcbe6175..07520a2ce179 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -255,10 +255,10 @@ int cedrus_hw_probe(struct cedrus_dev *dev)
res = platform_get_resource(dev->pdev, IORESOURCE_MEM, 0);
dev->base = devm_ioremap_resource(dev->dev, res);
- if (!dev->base) {
+ if (IS_ERR(dev->base)) {
v4l2_err(&dev->v4l2_dev, "Failed to map registers\n");
- ret = -ENOMEM;
+ ret = PTR_ERR(dev->base);
goto err_sram;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: cedrus: Fix a NULL vs IS_ERR() check
2018-11-26 8:10 [PATCH] media: cedrus: Fix a NULL vs IS_ERR() check Dan Carpenter
@ 2018-11-26 8:21 ` Paul Kocialkowski
0 siblings, 0 replies; 2+ messages in thread
From: Paul Kocialkowski @ 2018-11-26 8:21 UTC (permalink / raw)
To: Dan Carpenter, Maxime Ripard
Cc: Mauro Carvalho Chehab, Greg Kroah-Hartman, Chen-Yu Tsai,
linux-media, devel, linux-arm-kernel, linux-kernel,
kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
On Mon, 2018-11-26 at 11:10 +0300, Dan Carpenter wrote:
> The devm_ioremap_resource() function doesn't return NULL pointers, it
> returns error pointers.
Good catch and thanks for the patch!
> Fixes: 50e761516f2b ("media: platform: Add Cedrus VPU decoder driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> ---
> drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
> index 32adbcbe6175..07520a2ce179 100644
> --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
> @@ -255,10 +255,10 @@ int cedrus_hw_probe(struct cedrus_dev *dev)
>
> res = platform_get_resource(dev->pdev, IORESOURCE_MEM, 0);
> dev->base = devm_ioremap_resource(dev->dev, res);
> - if (!dev->base) {
> + if (IS_ERR(dev->base)) {
> v4l2_err(&dev->v4l2_dev, "Failed to map registers\n");
>
> - ret = -ENOMEM;
> + ret = PTR_ERR(dev->base);
> goto err_sram;
> }
>
--
Paul Kocialkowski, Bootlin (formerly Free Electrons)
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-26 19:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-26 8:10 [PATCH] media: cedrus: Fix a NULL vs IS_ERR() check Dan Carpenter
2018-11-26 8:21 ` Paul Kocialkowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).