diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
| commit | d69f58e2b8396658b7577113f9887bd4d66d25f8 (patch) | |
| tree | 217a2a766669c825645f5ff5b64ff6fcc875efc5 /net/dsa/slave.c | |
| parent | efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf (diff) | |
| parent | 4686ea264f1dfec6bc5db9ef4bb9ed5babbb78cd (diff) | |
Merge tag 'v4.4.47' into linux-linaro-lsk-v4.4
This is the 4.4.47 stable release
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 7bc787b095c8..8dfe9fb7ad36 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1101,6 +1101,8 @@ int dsa_slave_suspend(struct net_device *slave_dev) { struct dsa_slave_priv *p = netdev_priv(slave_dev); + netif_device_detach(slave_dev); + if (p->phy) { phy_stop(p->phy); p->old_pause = -1; |