From patchwork Sun Jul 24 17:34:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 1003152 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6OI0PX5008109 for ; Sun, 24 Jul 2011 18:00:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752479Ab1GXSAI (ORCPT ); Sun, 24 Jul 2011 14:00:08 -0400 Received: from queueout04-winn.ispmail.ntl.com ([81.103.221.58]:35191 "EHLO queueout04-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428Ab1GXSAH (ORCPT ); Sun, 24 Jul 2011 14:00:07 -0400 Received: from aamtaout01-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout03-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20110724173432.YKXY5301.mtaout03-winn.ispmail.ntl.com@aamtaout01-winn.ispmail.ntl.com>; Sun, 24 Jul 2011 18:34:32 +0100 Received: from zog.reactivated.net ([86.14.215.141]) by aamtaout01-winn.ispmail.ntl.com (InterMail vG.3.00.04.00 201-2196-133-20080908) with ESMTP id <20110724173432.OHKO20122.aamtaout01-winn.ispmail.ntl.com@zog.reactivated.net>; Sun, 24 Jul 2011 18:34:32 +0100 Received: by zog.reactivated.net (Postfix, from userid 1000) id BE03C9D401C; Sun, 24 Jul 2011 18:34:30 +0100 (BST) From: Daniel Drake To: tglx@linutronix.de To: mingo@redhat.com To: hpa@zytor.com To: x86@kernel.org Cc: linux-kernel@vger.kernel.org Cc: dilinger@queued.net Cc: linux-acpi@vger.kernel.org Subject: [PATCH resend] x86, olpc-xo15-sci: enable EC wakeup capability Message-Id: <20110724173430.BE03C9D401C@zog.reactivated.net> Date: Sun, 24 Jul 2011 18:34:30 +0100 (BST) X-Cloudmark-Analysis: v=1.1 cv=JvdXmxIgLJv2/GthKqHpGJEEHukvLcvELVXUanXFreg= c=1 sm=0 a=b1b2ER6-X5gA:10 a=vJ1w_8FsMGIA:10 a=Op-mwl0xAAAA:8 a=aj1OkgN8WNMVO4dtLEQA:9 a=d4CUUju0HPYA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 24 Jul 2011 18:00:25 +0000 (UTC) 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 --- 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; }