projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/flash-dma', 'spi/topic/imx', 'spi/topic...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
ezchip
/
nps_enet.c
diff --git
a/drivers/net/ethernet/ezchip/nps_enet.c
b/drivers/net/ethernet/ezchip/nps_enet.c
index
06f0317
..
9b7a3f5
100644
(file)
--- a/
drivers/net/ethernet/ezchip/nps_enet.c
+++ b/
drivers/net/ethernet/ezchip/nps_enet.c
@@
-285,6
+285,7
@@
static void nps_enet_hw_reset(struct net_device *ndev)
ge_rst_value |= NPS_ENET_ENABLE << RST_GMAC_0_SHIFT;
nps_enet_reg_set(priv, NPS_ENET_REG_GE_RST, ge_rst_value);
usleep_range(10, 20);
+ ge_rst_value = 0;
nps_enet_reg_set(priv, NPS_ENET_REG_GE_RST, ge_rst_value);
/* Tx fifo reset sequence */