From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 12 Jul 2016 00:17:28 +0000 (+0000)
Subject: net: ethernet: bgmac: Fix return value check in bgmac_probe()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=12c2e32f14da857b58af281b029d4549d24c3292;p=linux.git

net: ethernet: bgmac: Fix return value check in bgmac_probe()

In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 7a8f7effe2a63..1a2d8418e7c17 100644
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -141,7 +141,7 @@ static int bgmac_probe(struct platform_device *pdev)
 	}
 
 	bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
-	if (!bgmac->plat.idm_base) {
+	if (IS_ERR(bgmac->plat.idm_base)) {
 		dev_err(&pdev->dev, "Unable to map idm resource\n");
 		return PTR_ERR(bgmac->plat.idm_base);
 	}