diff options
| author | Diego Viola <diego.viola@gmail.com> | 2016-02-23 16:04:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-25 05:58:21 +0100 |
| commit | ee50c130c82175eaa0820c96b6d3763928af2241 (patch) | |
| tree | a2cfe07446fc9d7a5fac0dd59d15833eab3a9b74 /drivers/net/ethernet/jme.c | |
| parent | Merge tag 'mac80211-for-davem-2016-02-23' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-ee50c130c82175eaa0820c96b6d3763928af2241.tar.xz linux-ee50c130c82175eaa0820c96b6d3763928af2241.zip | |
net: jme: fix suspend/resume on JMC260
The JMC260 network card fails to suspend/resume because the call to
jme_start_irq() was too early, moving the call to jme_start_irq() after
the call to jme_reset_link() makes it work.
Prior this change suspend/resume would fail unless /sys/power/pm_async=0
was explicitly specified.
Relevant bug report: https://bugzilla.kernel.org/show_bug.cgi?id=112351
Signed-off-by: Diego Viola <diego.viola@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index b1de7afd4116..8adbe8ff0eb8 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -3312,13 +3312,14 @@ jme_resume(struct device *dev) jme_reset_phy_processor(jme); jme_phy_calibration(jme); jme_phy_setEA(jme); - jme_start_irq(jme); netif_device_attach(netdev); atomic_inc(&jme->link_changing); jme_reset_link(jme); + jme_start_irq(jme); + return 0; } |