diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:51 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:51 +0800 |
| commit | 95a8e64a288afaadb5e77210df0dfa02ffd0eb43 (patch) | |
| tree | 3bedc7c74219d261d89a47307e9b519820637093 /drivers/net/phy/phy.c | |
| parent | 52e49f436844e374d67859cbfb2c9cc62eb7e59b (diff) | |
| parent | 0e13335254d5d54933969dba1d7625f55e657f52 (diff) | |
Merge tag 'v3.18.72' into linux-linaro-lsk-v3.18lsk-v3.18-17.09
This is the 3.18.72 stable release
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index caf4d3469d4a..7ae062743bad 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -509,9 +509,6 @@ void phy_stop_machine(struct phy_device *phydev) if (phydev->state > PHY_UP && phydev->state != PHY_HALTED) phydev->state = PHY_UP; mutex_unlock(&phydev->lock); - - /* Now we can run the state machine synchronously */ - phy_state_machine(&phydev->state_queue.work); } /** |