Skip to content

Commit ef24d6c

Browse files
seehearfeeldavem330
authored andcommitted
net: Fix return value about devm_platform_ioremap_resource()
When call function devm_platform_ioremap_resource(), we should use IS_ERR() to check the return value and return PTR_ERR() if failed. Signed-off-by: Tiezhu Yang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d04322a commit ef24d6c

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

drivers/net/can/ifi_canfd/ifi_canfd.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,8 +947,11 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)
947947
u32 id, rev;
948948

949949
addr = devm_platform_ioremap_resource(pdev, 0);
950+
if (IS_ERR(addr))
951+
return PTR_ERR(addr);
952+
950953
irq = platform_get_irq(pdev, 0);
951-
if (IS_ERR(addr) || irq < 0)
954+
if (irq < 0)
952955
return -EINVAL;
953956

954957
id = readl(addr + IFI_CANFD_IP_ID);

drivers/net/can/sun4i_can.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ static int sun4ican_probe(struct platform_device *pdev)
792792

793793
addr = devm_platform_ioremap_resource(pdev, 0);
794794
if (IS_ERR(addr)) {
795-
err = -EBUSY;
795+
err = PTR_ERR(addr);
796796
goto exit;
797797
}
798798

drivers/net/dsa/b53/b53_srab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ static int b53_srab_probe(struct platform_device *pdev)
609609

610610
priv->regs = devm_platform_ioremap_resource(pdev, 0);
611611
if (IS_ERR(priv->regs))
612-
return -ENOMEM;
612+
return PTR_ERR(priv->regs);
613613

614614
dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, priv);
615615
if (!dev)

drivers/net/ethernet/marvell/pxa168_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
14181418

14191419
pep->base = devm_platform_ioremap_resource(pdev, 0);
14201420
if (IS_ERR(pep->base)) {
1421-
err = -ENOMEM;
1421+
err = PTR_ERR(pep->base);
14221422
goto err_netdev;
14231423
}
14241424

0 commit comments

Comments
 (0)