diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 13:39:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 13:39:53 +0200 |
| commit | cbcd085da2f99a8b36a07256dd7d1aae38b1d80f (patch) | |
| tree | f6ff7373eba2ae700a49a855707a7c63552190ef /drivers/base/power/wakeup.c | |
| parent | 9e50bc14a7f58b5d8a55973b2d69355852ae2dae (diff) | |
| parent | 0c5ff0ef80c2561ef20721299ecfc39c5a42f694 (diff) | |
Merge branch 'pm-sleep' into acpi-battery
Diffstat (limited to 'drivers/base/power/wakeup.c')
| -rw-r--r-- | drivers/base/power/wakeup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 2d56f4113ae7..eb1bd2ecad8b 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -318,10 +318,16 @@ int device_init_wakeup(struct device *dev, bool enable) { int ret = 0; + if (!dev) + return -EINVAL; + if (enable) { device_set_wakeup_capable(dev, true); ret = device_wakeup_enable(dev); } else { + if (dev->power.can_wakeup) + device_wakeup_disable(dev); + device_set_wakeup_capable(dev, false); } |