From 680644c9613ac42700d52657aee6da21a2733b9e Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Sun, 13 Jun 2010 00:36:52 +0200 Subject: [PATCH] --- yaml --- r: 202540 b: refs/heads/master c: 2430d12c94ff2bafcfe4f65edf7ee5f300d2d9c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pm_wakeup.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3f85a3b6ce9..19d149bbf016 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90133673395849c9d4e66a563f2d0d91d92aa461 +refs/heads/master: 2430d12c94ff2bafcfe4f65edf7ee5f300d2d9c6 diff --git a/trunk/include/linux/pm_wakeup.h b/trunk/include/linux/pm_wakeup.h index 22d64c18056c..76aca48722ae 100644 --- a/trunk/include/linux/pm_wakeup.h +++ b/trunk/include/linux/pm_wakeup.h @@ -29,8 +29,11 @@ #ifdef CONFIG_PM -/* changes to device_may_wakeup take effect on the next pm state change. - * by default, devices should wakeup if they can. +/* Changes to device_may_wakeup take effect on the next pm state change. + * + * By default, most devices should leave wakeup disabled. The exceptions + * are devices that everyone expects to be wakeup sources: keyboards, + * power buttons, possibly network interfaces, etc. */ static inline void device_init_wakeup(struct device *dev, bool val) { @@ -59,7 +62,7 @@ static inline bool device_may_wakeup(struct device *dev) #else /* !CONFIG_PM */ -/* For some reason the next two routines work even without CONFIG_PM */ +/* For some reason the following routines work even without CONFIG_PM */ static inline void device_init_wakeup(struct device *dev, bool val) { dev->power.can_wakeup = val; @@ -67,6 +70,7 @@ static inline void device_init_wakeup(struct device *dev, bool val) static inline void device_set_wakeup_capable(struct device *dev, bool capable) { + dev->power.can_wakeup = capable; } static inline bool device_can_wakeup(struct device *dev)