aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2018-11-13 18:42:24 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-16 19:46:49 -0800
commit06bc4d0079ab6a2de86f56703ce1bd13e90b9d9d (patch)
tree559f53c9b83141ae37eb32b6616176209317416e /drivers
parentipv6: fix a dst leak when removing its exception (diff)
downloadlinux-dev-06bc4d0079ab6a2de86f56703ce1bd13e90b9d9d.tar.xz
linux-dev-06bc4d0079ab6a2de86f56703ce1bd13e90b9d9d.zip
net: lantiq: Fix returned value in case of error in 'xrx200_probe()'
Return 'err' in the error handling path instead of 0. Return explicitly 0 in the normal path, instead of 'err', which is known to be 0 at this point. Fixes: fe1a56420cf2 ("net: lantiq: Add Lantiq / Intel VRX200 Ethernet driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/lantiq_xrx200.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c
index 8c5ba4b81fb7..2d4d10a017e5 100644
--- a/drivers/net/ethernet/lantiq_xrx200.c
+++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -512,7 +512,8 @@ static int xrx200_probe(struct platform_device *pdev)
err = register_netdev(net_dev);
if (err)
goto err_unprepare_clk;
- return err;
+
+ return 0;
err_unprepare_clk:
clk_disable_unprepare(priv->clk);
@@ -520,7 +521,7 @@ err_unprepare_clk:
err_uninit_dma:
xrx200_hw_cleanup(priv);
- return 0;
+ return err;
}
static int xrx200_remove(struct platform_device *pdev)