summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/nxp
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@bootlin.com>2019-10-10 22:46:06 +0200
committerDavid S. Miller <davem@davemloft.net>2019-10-13 20:15:25 +0200
commitc23936fad79ea2bea749db19b8921bb4dc524905 (patch)
tree0cb77e24b44db132311eb6e48b4239e02e80a9cf /drivers/net/ethernet/nxp
parentMerge branch 'tcp-address-KCSAN-reports-in-tcp_poll-part-I' (diff)
downloadlinux-c23936fad79ea2bea749db19b8921bb4dc524905.tar.xz
linux-c23936fad79ea2bea749db19b8921bb4dc524905.zip
net: lpc_eth: avoid resetting twice
__lpc_eth_shutdown is called after __lpc_eth_reset but it is already calling __lpc_eth_reset. Avoid resetting the IP twice. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/nxp')
-rw-r--r--drivers/net/ethernet/nxp/lpc_eth.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 141571e2ec11..544012a67221 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1356,9 +1356,6 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev);
- /* Reset the ethernet controller */
- __lpc_eth_reset(pldat);
-
/* then shut everything down to save power */
__lpc_eth_shutdown(pldat);