---

yaml --- r: 266934 b: refs/heads/master c: a7d5b76 h: refs/heads/master v: v3
git-mirror · Oct 24, 2011 · 366d2c3 · 366d2c3
1 parent c88cc62
commit 366d2c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cc9150ebe8ec06cafea9f1c10d92ddacf88d8ae
+refs/heads/master: a7d5b76d9a7e434e32a5b2815db45489617dcba6
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
@@ -3131,6 +3131,9 @@ jme_suspend(struct device *dev)
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct jme_adapter *jme = netdev_priv(netdev);
 
+	if (!netif_running(netdev))
+		return 0;
+
 	atomic_dec(&jme->link_changing);
 
 	netif_device_detach(netdev);
@@ -3171,6 +3174,9 @@ jme_resume(struct device *dev)
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct jme_adapter *jme = netdev_priv(netdev);
 
+	if (!netif_running(netdev))
+		return 0;
+
 	jme_clear_pm(jme);
 	jme_phy_on(jme);
 	if (test_bit(JME_FLAG_SSET, &jme->flags))