| Message ID | 20181126081044.yz5tenssdbt7mugb@kili.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: cedrus: Fix a NULL vs IS_ERR() check | expand |
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; > } >
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; }
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(-)