KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: mt7621-eth: fix return value check in mt7621_gsw_probe()

Browse source 
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: f079b6406348 ("staging: mt7621-eth: add gigabit switch driver (GSW)")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wei Yongjun 2018-05-14 11:14:25 -07:00 committed by John Crispin
parent edec251870
commit 87c254c87e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/esw_rt3050.c
View file

@ -1358,8 +1358,8 @@ static int esw_probe(struct platform_device *pdev)
esw->dev = &pdev->dev; esw->dev = &pdev->dev;
esw->irq = irq_of_parse_and_map(np, 0); esw->irq = irq_of_parse_and_map(np, 0);
esw->base = devm_ioremap_resource(&pdev->dev, res); esw->base = devm_ioremap_resource(&pdev->dev, res);
if (!esw->base) if (IS_ERR(esw->base))
return -EADDRNOTAVAIL; return PTR_ERR(esw->base);
port_map = of_get_property(np, "mediatek,portmap", NULL); port_map = of_get_property(np, "mediatek,portmap", NULL);
if (port_map) if (port_map)

4
target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c
View file

@ -215,8 +215,8 @@ static int mt7620_gsw_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
gsw->base = devm_ioremap_resource(&pdev->dev, res); gsw->base = devm_ioremap_resource(&pdev->dev, res);
if (!gsw->base) if (IS_ERR(gsw->base))
return -EADDRNOTAVAIL; return PTR_ERR(gsw->base);
gsw->dev = &pdev->dev; gsw->dev = &pdev->dev;

4
target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7621.c
View file

@ -245,8 +245,8 @@ static int mt7621_gsw_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
gsw->base = devm_ioremap_resource(&pdev->dev, res); gsw->base = devm_ioremap_resource(&pdev->dev, res);
if (!gsw->base) if (IS_ERR(gsw->base))
return -EADDRNOTAVAIL; return PTR_ERR(gsw->base);
gsw->dev = &pdev->dev; gsw->dev = &pdev->dev;
gsw->irq = platform_get_irq(pdev, 0); gsw->irq = platform_get_irq(pdev, 0);