[PATCH] x86, olpc-xo15-sci: enable EC wakeup capability

From: Daniel Drake
Date: Sat Jul 09 2011 - 17:41:01 EST


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@xxxxxxxxxx>
---
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;
}
--
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/