diff options
| author | Diego Viola <diego.viola@gmail.com> | 2016-02-23 12:04:04 -0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 23:06:59 -0400 |
| commit | 2131abc39f1033260ffc66a37e26bef9ddab8b16 (patch) | |
| tree | d52da7c7aeb8a70a1c6547fe340667ab38a78006 /drivers/net | |
| parent | ea82b38fce682e4277cb20f385b3cebbb91cd1e5 (diff) | |
net: jme: fix suspend/resume on JMC260
[ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/net')
| -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 6e9a792097d3..32d240b332d2 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -3316,13 +3316,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; } |