summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-09-09 23:51:27 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-14 13:41:42 -0700
commit999cce4a52d5abdda5d2cec6bac241899bc19e4c (patch)
tree0702e1050d8b31a377e8aade76777c5f1d45869e /drivers
parentfdcdaf6c4feca025de2f5e1b6c8e08ba0649e85a (diff)
downloadlinux-999cce4a52d5abdda5d2cec6bac241899bc19e4c.tar.bz2
PCI PM: Return error codes from pci_pm_resume()
Currently pci_pm_resume() always returns 0, which makes the error variable defined in there a bit pointless. Make pci_pm_resume() return error codes obtained from drivers' callbacks. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index c66dc4341fa0..dbfc93cb5d01 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -722,7 +722,7 @@ static int pci_pm_resume(struct device *dev)
pci_pm_reenable_device(pci_dev);
}
- return 0;
+ return error;
}
#else /* !CONFIG_SUSPEND */