PCI PM: Return error codes from pci_pm_resume()
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Sep 2009 21:51:27 +0000 (23:51 +0200)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 14 Sep 2009 20:41:42 +0000 (13:41 -0700)
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>
drivers/pci/pci-driver.c

index c66dc4341fa027d8eaae0fca6254687d52e2472f..dbfc93cb5d011d52bae9c2aecb5ec3309139b1be 100644 (file)
@@ -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 */