aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmiliano Ingrassia <ingrassia@epigenesys.com>2017-10-12 11:00:47 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-13 10:19:52 -0700
commitb9849860675f925da0380f4ea76c3f5041909737 (patch)
treee560cbe003890704b1e850ee1f5fe2de8ccbf84a
parentliquidio: fix timespec64_to_ns typo (diff)
downloadlinux-dev-b9849860675f925da0380f4ea76c3f5041909737.tar.xz
linux-dev-b9849860675f925da0380f4ea76c3f5041909737.zip
net: stmmac: dwmac_lib: fix interchanged sleep/timeout values in DMA reset function
The DMA reset timeout, used in read_poll_timeout, is ten times shorter than the sleep time. This patch fixes these values interchanging them, as it was before the read_poll_timeout introduction. Fixes: 8a70aeca80c2 ("net: stmmac: Use readl_poll_timeout") Signed-off-by: Emiliano Ingrassia <ingrassia@epigenesys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
index 67af0bdd7f10..7516ca210855 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
@@ -34,7 +34,7 @@ int dwmac_dma_reset(void __iomem *ioaddr)
err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
!(value & DMA_BUS_MODE_SFT_RESET),
- 100000, 10000);
+ 10000, 100000);
if (err)
return -EBUSY;