From patchwork Wed Feb 3 18:59:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 76773 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o13J07Ng023004 for ; Wed, 3 Feb 2010 19:00:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757040Ab0BCTAF (ORCPT ); Wed, 3 Feb 2010 14:00:05 -0500 Received: from mail-ew0-f228.google.com ([209.85.219.228]:39723 "EHLO mail-ew0-f228.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756284Ab0BCTAE (ORCPT ); Wed, 3 Feb 2010 14:00:04 -0500 Received: by ewy28 with SMTP id 28so1805740ewy.28 for ; Wed, 03 Feb 2010 11:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=Sa1c8DB3Y2mkIiDCj6TGCRM8vo9By2mo7eslMsAU+sE=; b=iWukL3d+ABGQ8XMG5v4NjsOCZjmbU5B2K8lKUd94ks4JyQ2t2mdJYeHCE6UE3j1V/W iuetxuOn8g1JMBMAa0EvxxPFW3MyHmvEYYE3RCZfc6rLDMornWOFsg44PflOeZb7uNrC EWPumXYTTkoNk/h8FRGLA4xy2EReZpKnd5yiQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=wDz94Pe6PggApeNYtJaCJpLsrTdmQI74c24N50kWpnUAP/9a4rV6yvz4R3XXnDRpQi KZU9Z4hOeYzOQNX6/EuIEovztpApFS4WXGPlvqulj9iGgBrzQ65t6Ds6V7xarnXHHccu nuCVHyd+wQXGTDj9HbvWhQf4u6WGTuD1G9bxc= Received: by 10.213.61.13 with SMTP id r13mr7800339ebh.26.1265223601309; Wed, 03 Feb 2010 11:00:01 -0800 (PST) Received: from ?192.168.0.4? ([86.53.68.233]) by mx.google.com with ESMTPS id 23sm47245eya.43.2010.02.03.10.59.58 (version=SSLv3 cipher=RC4-MD5); Wed, 03 Feb 2010 10:59:59 -0800 (PST) Message-ID: <4B69C7AA.7000904@tuffmail.co.uk> Date: Wed, 03 Feb 2010 18:59:54 +0000 From: Alan Jenkins User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Dmitry Torokhov CC: linux-input@vger.kernel.org, linux-kernel Subject: [PATCH] Input: serio - re-add thaw (and add freeze) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 03 Feb 2010 19:00:07 +0000 (UTC) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index d84a36e..9599766 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1164,6 +1164,8 @@ static int i8042_pm_restore(struct device *dev) static const struct dev_pm_ops i8042_pm_ops = { .suspend = i8042_pm_reset, .resume = i8042_pm_restore, + .freeze = i8042_pm_reset, + .thaw = i8042_pm_restore, .poweroff = i8042_pm_reset, .restore = i8042_pm_restore, }; diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index e0f3018..2e8f544 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -949,6 +949,8 @@ static int serio_resume(struct device *dev) static const struct dev_pm_ops serio_pm_ops = { .suspend = serio_suspend, .resume = serio_resume, + .freeze = serio_suspend, + .thaw = serio_resume, .poweroff = serio_suspend, .restore = serio_resume, };