From 8ec3e833dc3f13427e7ceee90239110c64408b65 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 4 Feb 2009 02:01:15 +0100 Subject: [PATCH] --- yaml --- r: 131112 b: refs/heads/master c: cbbc2f6b0d438f80831c20124137ea92f0e5149b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci-driver.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 236ea56902f8..bf9b5d522d6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca +refs/heads/master: cbbc2f6b0d438f80831c20124137ea92f0e5149b diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index fdb6a697e05a..ac6c9e493f4c 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/drivers/pci/pci-driver.c @@ -434,16 +434,18 @@ static int pci_pm_default_resume(struct pci_dev *pci_dev) { pci_fixup_device(pci_fixup_resume, pci_dev); - if (!pci_is_bridge(pci_dev)) - pci_enable_wake(pci_dev, PCI_D0, false); + if (pci_is_bridge(pci_dev)) + return 0; + pci_enable_wake(pci_dev, PCI_D0, false); return pci_pm_reenable_device(pci_dev); } static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev) { - /* If device is enabled at this point, disable it */ - pci_disable_enabled_device(pci_dev); + /* If a non-bridge device is enabled at this point, disable it */ + if (!pci_is_bridge(pci_dev)) + pci_disable_enabled_device(pci_dev); /* * Save state with interrupts enabled, because in principle the bus the * device is on may be put into a low power state after this code runs.