]> git.itanic.dy.fi Git - linux-stable/commitdiff
char: xilinx_hwicap: Fix NULL vs IS_ERR() bug
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 20 Feb 2024 09:02:31 +0000 (12:02 +0300)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:17:30 +0000 (18:17 -0400)
[ Upstream commit 316459ba4051fd91237171fdca88920128a646f1 ]

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>
Acked-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/ef647a9c-b1b7-4338-9bc0-28165ec2a367@moroto.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/char/xilinx_hwicap/xilinx_hwicap.c

index 019cf6079cecd61f96f03603f27aa526e75077ba..6d2eadefd9dc92eb92df0fa7ce4e0c21fb1691ac 100644 (file)
@@ -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;
        }