]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: sgi: ioc3-eth: Fix return value check in ioc3eth_probe()
authorTang Bin <tangbin@cmss.chinamobile.com>
Wed, 20 May 2020 09:55:32 +0000 (17:55 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 00:26:54 +0000 (17:26 -0700)
In the function devm_platform_ioremap_resource(), if get resource
failed, the return value is ERR_PTR() not NULL. Thus it must be
replaced by IS_ERR(), or else it may result in crashes if a critical
error path is encountered.

Fixes: 593eec2361d6 ("mfd: ioc3: Add driver for SGI IOC3 chip")
Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sgi/ioc3-eth.c

index 7305e8e86c51fea36504f6440edb73a5bb67bf77..6646eba9f57fe6014bd4a9c7d94f00a68626ddc7 100644 (file)
@@ -848,14 +848,14 @@ static int ioc3eth_probe(struct platform_device *pdev)
        ip = netdev_priv(dev);
        ip->dma_dev = pdev->dev.parent;
        ip->regs = devm_platform_ioremap_resource(pdev, 0);
-       if (!ip->regs) {
-               err = -ENOMEM;
+       if (IS_ERR(ip->regs)) {
+               err = PTR_ERR(ip->regs);
                goto out_free;
        }
 
        ip->ssram = devm_platform_ioremap_resource(pdev, 1);
-       if (!ip->ssram) {
-               err = -ENOMEM;
+       if (IS_ERR(ip->ssram)) {
+               err = PTR_ERR(ip->ssram);
                goto out_free;
        }