X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Facpi%2Fdevice_pm.c;h=d260bc1f3e6e72a12310ba92e8b1f399d0cdb04e;hb=fd38651716b45f817a542c34cd5336ff372d06e6;hp=58876248b1921efadfa1da71628b1475a3e3ec10;hpb=2404b8747019184002823dba7d2f0ecf89d802b7;p=platform%2Fkernel%2Flinux-starfive.git diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 5887624..d260bc1 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -966,6 +966,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume); int acpi_subsys_runtime_suspend(struct device *dev) { int ret = pm_generic_runtime_suspend(dev); + return ret ? ret : acpi_dev_suspend(dev, true); } EXPORT_SYMBOL_GPL(acpi_subsys_runtime_suspend); @@ -980,6 +981,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_runtime_suspend); int acpi_subsys_runtime_resume(struct device *dev) { int ret = acpi_dev_resume(dev); + return ret ? ret : pm_generic_runtime_resume(dev); } EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume); @@ -1171,6 +1173,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze); int acpi_subsys_restore_early(struct device *dev) { int ret = acpi_dev_resume(dev); + return ret ? ret : pm_generic_restore_early(dev); } EXPORT_SYMBOL_GPL(acpi_subsys_restore_early);