shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "net: stmmac: replace msleep with mdelay between spinlock and spinunlock"

Browse Source 
This reverts commit b664a51a07.
Upstream commit f55d84b07c ("stmmac: do not sleep in atomic context for mdio_reset")
fixes this bug.

Change-Id: I7332b3586640667f551c7e83eafff560a4f5a478
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
This commit is contained in:
Huang, Tao
2016-07-04 18:13:57 +08:00
parent 6d7cc1fdfa
commit 92d66262c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View File

@@ -161,15 +161,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
gpio_direction_output(data->reset_gpio,
data->active_low ? 1 : 0);
if (data->delays[0])
mdelay(DIV_ROUND_UP(data->delays[0], 1000));
msleep(DIV_ROUND_UP(data->delays[0], 1000));
gpio_set_value(data->reset_gpio, data->active_low ? 0 : 1);
if (data->delays[1])
mdelay(DIV_ROUND_UP(data->delays[1], 1000));
msleep(DIV_ROUND_UP(data->delays[1], 1000));
gpio_set_value(data->reset_gpio, data->active_low ? 1 : 0);
if (data->delays[2])
mdelay(DIV_ROUND_UP(data->delays[2], 1000));
msleep(DIV_ROUND_UP(data->delays[2], 1000));
}
#endif