]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ll_temac: Fix return value check in temac_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 27 Apr 2020 09:40:52 +0000 (09:40 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 May 2020 03:39:22 +0000 (20:39 -0700)
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/xilinx/ll_temac_main.c

index 3e313e71ae36839492e712782d0997eac128a2a7..929244064abd97038a9f41034ee5d61df5fbb951 100644 (file)
@@ -1410,9 +1410,9 @@ static int temac_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        lp->regs = devm_ioremap(&pdev->dev, res->start,
                                        resource_size(res));
-       if (IS_ERR(lp->regs)) {
+       if (!lp->regs) {
                dev_err(&pdev->dev, "could not map TEMAC registers\n");
-               return PTR_ERR(lp->regs);
+               return -ENOMEM;
        }
 
        /* Select register access functions with the specified
@@ -1505,10 +1505,10 @@ static int temac_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                lp->sdma_regs = devm_ioremap(&pdev->dev, res->start,
                                                     resource_size(res));
-               if (IS_ERR(lp->sdma_regs)) {
+               if (!lp->sdma_regs) {
                        dev_err(&pdev->dev,
                                "could not map DMA registers\n");
-                       return PTR_ERR(lp->sdma_regs);
+                       return -ENOMEM;
                }
                if (pdata->dma_little_endian) {
                        lp->dma_in = temac_dma_in32_le;