From 366d2c302a65f6890ba133813e54534c819f54af Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 22 Oct 2011 02:56:20 +0000 Subject: [PATCH] --- yaml --- r: 266934 b: refs/heads/master c: a7d5b76d9a7e434e32a5b2815db45489617dcba6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/jme.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d7caa8ceec76..765bd409f493 100644 --- 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 index 3ac262f55633..7a8a3b64276c 100644 --- 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))