aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci-driver.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
commit4741c336d27dec3ea68a35659abb8dc82b142388 (patch)
treea8576df82129354b77b0144c480c446ec7aba7b2 /drivers/pci/pci-driver.c
parent26ec634c31a11a003040e10b4d650495158632fd (diff)
parenta9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r--drivers/pci/pci-driver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index f22f69ac6445..1456759936c5 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -271,10 +271,12 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)
271 struct pci_driver * drv = pci_dev->driver; 271 struct pci_driver * drv = pci_dev->driver;
272 int i = 0; 272 int i = 0;
273 273
274 if (drv && drv->suspend) 274 if (drv && drv->suspend) {
275 i = drv->suspend(pci_dev, state); 275 i = drv->suspend(pci_dev, state);
276 else 276 suspend_report_result(drv->suspend, i);
277 } else {
277 pci_save_state(pci_dev); 278 pci_save_state(pci_dev);
279 }
278 return i; 280 return i;
279} 281}
280 282