From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Mon, 14 May 2018 18:14:23 +0000 (-0700)
Subject: staging: mt7621-eth: fix return value check in mtk_probe()
X-Git-Tag: v18.06.0-rc1~187
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4ae54dfabc982d9b8865984b91e493745da12e2;p=oweals%2Fopenwrt.git

staging: mt7621-eth: fix return value check in mtk_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().

Fixes: e3cbf478f846 ("staging: mt7621-eth: add the drivers core files")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c
index d0d88b92c5..c806e289b5 100644
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c
@@ -1513,7 +1513,7 @@ static int fe_probe(struct platform_device *pdev)
 		soc->reg_table = fe_reg_table;
 
 	fe_base = devm_ioremap_resource(&pdev->dev, res);
-	if (!fe_base) {
+	if (IS_ERR(fe_base)) {
 		err = -EADDRNOTAVAIL;
 		goto err_out;
 	}