From patchwork Wed Feb 17 11:03:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 79859 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 o1HB48Ef002073 for ; Wed, 17 Feb 2010 11:04:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754488Ab0BQLEF (ORCPT ); Wed, 17 Feb 2010 06:04:05 -0500 Received: from mail-ew0-f228.google.com ([209.85.219.228]:47666 "EHLO mail-ew0-f228.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751861Ab0BQLEE (ORCPT ); Wed, 17 Feb 2010 06:04:04 -0500 Received: by ewy28 with SMTP id 28so2724748ewy.28 for ; Wed, 17 Feb 2010 03:04:00 -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=CKmxkhzQw1ijVrdbFOM+7MImWbG+7agsiIGJmqTC1aI=; b=i7BXGiE9l+UpHdADDeUWe43ZdGSnZ/7Z+ttD7zoQSuWNrA+QTfY2BhQTTmQf0fWuHP WSgfNowN/UFw2Km/+cMrOQdxR3WT5GGdOJBxfSVKGxcU00PrUjb+j4n8ckusRXO8h+W2 W4TOKfFLk2Ne6LenjWV41/EkFD2Bs9zCaSxvs= 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=ZV7ybG5fZWuSsolgLGwzfJYLZyQCrXqtA2liASvPdw2OBt5MuaaQGH4ujyapPmTCez fnuAebWnPopsMMwMF2Yo4iToOFZqvysoM6rifzAVjiDr2fv07MBrdtvq0kZM4zBqGySv IqDnGpKRw9ENGx1xnQKsBTka/ekJJtrInZicY= Received: by 10.213.109.197 with SMTP id k5mr771609ebp.54.1266404640039; Wed, 17 Feb 2010 03:04:00 -0800 (PST) Received: from ?192.168.0.4? ([86.53.68.233]) by mx.google.com with ESMTPS id 15sm5805570ewy.0.2010.02.17.03.03.58 (version=SSLv3 cipher=RC4-MD5); Wed, 17 Feb 2010 03:03:59 -0800 (PST) Message-ID: <4B7BCD1C.4020102@tuffmail.co.uk> Date: Wed, 17 Feb 2010 11:03:56 +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 - add thaw 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, 17 Feb 2010 11:04:09 +0000 (UTC) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index d84a36e..b54aee7 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1161,9 +1161,17 @@ static int i8042_pm_restore(struct device *dev) return 0; } +static int i8042_pm_thaw(struct device *dev) +{ + i8042_interrupt(0, NULL); + + return 0; +} + static const struct dev_pm_ops i8042_pm_ops = { .suspend = i8042_pm_reset, .resume = i8042_pm_restore, + .thaw = i8042_pm_thaw, .poweroff = i8042_pm_reset, .restore = i8042_pm_restore, };