Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 7a0c746f2749..7becff1f387d 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -3132,6 +3132,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);
@@ -3172,6 +3175,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))