Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 42159a28f4332f8dace6c4089c98ebbc86683209..feece693d773be300959d1bb1f8b58c975d05e79 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -689,19 +689,25 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
 {
        acpi_handle handle;
        struct acpi_device *adev;
+       int error;
 
-       if (!device_may_wakeup(dev))
+       if (!device_can_wakeup(dev))
                return -EINVAL;
 
        handle = DEVICE_ACPI_HANDLE(dev);
        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-               printk(KERN_DEBUG "ACPI handle has no context!\n");
+               dev_dbg(dev, "ACPI handle has no context in %s!\n", __func__);
                return -ENODEV;
        }
 
-       return enable ?
+       error = enable ?
                acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
                acpi_disable_wakeup_device_power(adev);
+       if (!error)
+               dev_info(dev, "wake-up capability %s by ACPI\n",
+                               enable ? "enabled" : "disabled");
+
+       return error;
 }
 #endif