diff --git a/[refs] b/[refs] index 53aa76fb1b83..de3a011d50a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5de556249fde97493a4c79dbf8979ace0f76789f +refs/heads/master: 4e48a2b91d408357cb0747151d8db5368ac8f1d0 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 9927106b76c7..9c6c1fbbc412 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -372,6 +372,7 @@ e1000_down(struct e1000_adapter *adapter) e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &mii_reg); mii_reg |= MII_CR_POWER_DOWN; e1000_write_phy_reg(&adapter->hw, PHY_CTRL, mii_reg); + mdelay(1); } }