From: Tang Bin <tang...@cmss.chinamobile.com>

commit a7654211d0ffeaa8eb0545ea00f8445242cbce05 upstream.

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: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip")
Signed-off-by: Zhang Shengju <zhangshen...@cmss.chinamobile.com>
Signed-off-by: Tang Bin <tang...@cmss.chinamobile.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/ethernet/sgi/ioc3-eth.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -865,14 +865,14 @@ static int ioc3eth_probe(struct platform
        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;
        }
 


Reply via email to