aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-05-14 11:14:23 -0700
committerJohn Crispin <john@phrozen.org>2018-05-15 06:45:34 +0200
commitc4ae54dfabc982d9b8865984b91e493745da12e2 (patch)
tree16d5b16211f8dc11b33d2d2bf01cdcdfe66210f9
parente07baec9faf487fd143976636025b5da55e13c20 (diff)
downloadupstream-c4ae54dfabc982d9b8865984b91e493745da12e2.tar.gz
upstream-c4ae54dfabc982d9b8865984b91e493745da12e2.tar.bz2
upstream-c4ae54dfabc982d9b8865984b91e493745da12e2.zip
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>
-rw-r--r--target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mtk_eth_soc.c2
1 files changed, 1 insertions, 1 deletions
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;
}