aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2013-04-14 18:04:33 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-15 14:09:37 -0400
commit72ca820bdb06bd1fef56aad07e0e045260bddb4e (patch)
tree49c91b520338a5467288bb74f405fb7d793d4e88
parentab09a6d0d38fc0da11e4cd57ec7f9fcfd16d335d (diff)
net/macb: fix error return code in macb_probe()
Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Original-idea-by: <yongjun_wei@trendmicro.com.cn> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/cadence/macb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 7fd0e3e977af..6be513deb17f 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1602,9 +1602,9 @@ static int __init macb_probe(struct platform_device *pdev)
1602 goto err_out_free_irq; 1602 goto err_out_free_irq;
1603 } 1603 }
1604 1604
1605 if (macb_mii_init(bp) != 0) { 1605 err = macb_mii_init(bp);
1606 if (err)
1606 goto err_out_unregister_netdev; 1607 goto err_out_unregister_netdev;
1607 }
1608 1608
1609 platform_set_drvdata(pdev, dev); 1609 platform_set_drvdata(pdev, dev);
1610 1610