aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorDavid Shaohua Li <shaohua.li@intel.com>2005-03-18 16:43:54 -0500
committerLen Brown <len.brown@intel.com>2005-07-11 23:23:46 -0400
commitd58da590451cf6ae75379a2ebf96d3afb8d810d8 (patch)
tree3b39228dbd1ed798965cf64f5bd98a498f5811cc /drivers/net/b44.c
parent362b06bb70b5a5779b2e852e0f2bdb437061106e (diff)
[ACPI] S3 Suspend to RAM: fix driver suspend/resume methods
Drivers should do this: .suspend() pci_disable_device() .resume() pci_enable_device() http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 3fe8ba992c38..38844d003e44 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1927,6 +1927,7 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
1927 b44_free_rings(bp); 1927 b44_free_rings(bp);
1928 1928
1929 spin_unlock_irq(&bp->lock); 1929 spin_unlock_irq(&bp->lock);
1930 pci_disable_device(pdev);
1930 return 0; 1931 return 0;
1931} 1932}
1932 1933
@@ -1936,6 +1937,8 @@ static int b44_resume(struct pci_dev *pdev)
1936 struct b44 *bp = netdev_priv(dev); 1937 struct b44 *bp = netdev_priv(dev);
1937 1938
1938 pci_restore_state(pdev); 1939 pci_restore_state(pdev);
1940 pci_enable_device(pdev);
1941 pci_set_master(pdev);
1939 1942
1940 if (!netif_running(dev)) 1943 if (!netif_running(dev))
1941 return 0; 1944 return 0;