| Message ID | ef647a9c-b1b7-4338-9bc0-28165ec2a367@moroto.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | char: xilinx_hwicap: Fix NULL vs IS_ERR() bug | expand |
On 2/20/24 10:02, Dan Carpenter wrote: > The devm_platform_ioremap_resource() function returns error pointers. > It never returns NULL. Update the check accordingly. > > Fixes: 672371832193 ("char: xilinx_hwicap: Modernize driver probe") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/char/xilinx_hwicap/xilinx_hwicap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c > index 019cf6079cec..6d2eadefd9dc 100644 > --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c > +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c > @@ -639,8 +639,8 @@ static int hwicap_setup(struct platform_device *pdev, int id, > dev_set_drvdata(dev, (void *)drvdata); > > drvdata->base_address = devm_platform_ioremap_resource(pdev, 0); > - if (!drvdata->base_address) { > - retval = -ENODEV; > + if (IS_ERR(drvdata->base_address)) { > + retval = PTR_ERR(drvdata->base_address); > goto failed; > } > Acked-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 019cf6079cec..6d2eadefd9dc 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -639,8 +639,8 @@ static int hwicap_setup(struct platform_device *pdev, int id, dev_set_drvdata(dev, (void *)drvdata); drvdata->base_address = devm_platform_ioremap_resource(pdev, 0); - if (!drvdata->base_address) { - retval = -ENODEV; + if (IS_ERR(drvdata->base_address)) { + retval = PTR_ERR(drvdata->base_address); goto failed; }
The devm_platform_ioremap_resource() function returns error pointers. It never returns NULL. Update the check accordingly. Fixes: 672371832193 ("char: xilinx_hwicap: Modernize driver probe") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)