Messages in this thread Patch in this message | | | Date | Sun, 24 Jul 2011 20:55:22 GMT | From | tip-bot for Daniel Drake <> | Subject | [tip:x86/olpc] x86, olpc-xo15-sci: Enable EC wakeup capability |
| |
Commit-ID: 07d5b38e14b7ff98eb52e4a6db4e20abcc608da3 Gitweb: http://git.kernel.org/tip/07d5b38e14b7ff98eb52e4a6db4e20abcc608da3 Author: Daniel Drake <dsd@laptop.org> AuthorDate: Sun, 24 Jul 2011 18:34:30 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 24 Jul 2011 20:16:05 +0200
x86, olpc-xo15-sci: Enable EC wakeup capability
Some recent changes to the way that ACPI handles wakeup flags means that the XO15EC ACPI device is not wakeup-capable by default so device_set_wakeup_enable() does nothing.
Use device_init_wakeup() to mark the device as wakeup capable, and to enable wakeups.
Signed-off-by: Daniel Drake <dsd@laptop.org> Link: http://lkml.kernel.org/r/20110724173430.BE03C9D401C@zog.reactivated.net Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index a5990eb..2b235b7 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -120,7 +120,7 @@ static int xo15_sci_add(struct acpi_device *device) /* Enable wake-on-EC */ if (device->wakeup.flags.valid) - device_set_wakeup_enable(&device->dev, true); + device_init_wakeup(&device->dev, true); return 0; }
| |