aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2011-10-21 22:56:20 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-24 02:58:09 -0400
commita7d5b76d9a7e434e32a5b2815db45489617dcba6 (patch)
tree0613e55954020f70fd21d9da6bce4bc74dd46489 /drivers
parent7cc9150ebe8ec06cafea9f1c10d92ddacf88d8ae (diff)
jme: fix irq storm after suspend/resume
If the device is down during suspend/resume, interrupts are enabled without a registered interrupt handler, causing a storm of unhandled interrupts until the IRQ is disabled because "nobody cared". Instead, check that the device is up before touching it in the suspend/resume code. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=39112 Helped-by: Adrian Chadd <adrian@freebsd.org> Helped-by: Mohammed Shafi <shafi.wireless@gmail.com> Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/jme.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 3ac262f55633..7a8a3b64276c 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -3131,6 +3131,9 @@ jme_suspend(struct device *dev)
3131 struct net_device *netdev = pci_get_drvdata(pdev); 3131 struct net_device *netdev = pci_get_drvdata(pdev);
3132 struct jme_adapter *jme = netdev_priv(netdev); 3132 struct jme_adapter *jme = netdev_priv(netdev);
3133 3133
3134 if (!netif_running(netdev))
3135 return 0;
3136
3134 atomic_dec(&jme->link_changing); 3137 atomic_dec(&jme->link_changing);
3135 3138
3136 netif_device_detach(netdev); 3139 netif_device_detach(netdev);
@@ -3171,6 +3174,9 @@ jme_resume(struct device *dev)
3171 struct net_device *netdev = pci_get_drvdata(pdev); 3174 struct net_device *netdev = pci_get_drvdata(pdev);
3172 struct jme_adapter *jme = netdev_priv(netdev); 3175 struct jme_adapter *jme = netdev_priv(netdev);
3173 3176
3177 if (!netif_running(netdev))
3178 return 0;
3179
3174 jme_clear_pm(jme); 3180 jme_clear_pm(jme);
3175 jme_phy_on(jme); 3181 jme_phy_on(jme);
3176 if (test_bit(JME_FLAG_SSET, &jme->flags)) 3182 if (test_bit(JME_FLAG_SSET, &jme->flags))