From patchwork Tue Feb 16 16:48:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Jenkins X-Patchwork-Id: 79750 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 o1GGmZDu011083 for ; Tue, 16 Feb 2010 16:48:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932809Ab0BPQsd (ORCPT ); Tue, 16 Feb 2010 11:48:33 -0500 Received: from mail-bw0-f219.google.com ([209.85.218.219]:33620 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932265Ab0BPQsc (ORCPT ); Tue, 16 Feb 2010 11:48:32 -0500 Received: by bwz19 with SMTP id 19so4564988bwz.28 for ; Tue, 16 Feb 2010 08:48:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=vzu2l3Sy1wtHhb50ChrdCxUXNO7HtyzAaebGmO71YbM=; b=ETWaOgdgTYYJfVIybIQtsaIPS6flFfMbe48QLvwEe+PcZlvt/NsaV9gqgK3efUm7X9 2KWPStPNn5OwHssbHNXwqYTZo+GvhwDwncRxrhJgkwGKPnXcJUSoWL0TZmt9YoUhY+eu iKhxSvFPfkEhYASj/AKsA1y7PQl0JbwsliNk0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=OAe/s8C/qhLPmwQ1i5qS8Mwv/c2vKFp2XuMJPbd8LVFJylNEDatgCFaSo2DQW8tkJ0 K/lxVvZ0+0SKJ6xzRXJXOpUPk6Yfzf2+JN9VgifPn+IZGEumj3jsIOE1FHPspm7RZDfm UNIq5Z+rWNUSMWJ/btGEGDXfUcPZUC/UR9MHo= MIME-Version: 1.0 Received: by 10.204.48.144 with SMTP id r16mr4472534bkf.176.1266338911212; Tue, 16 Feb 2010 08:48:31 -0800 (PST) In-Reply-To: <4B6A9FD7.5040207@tuffmail.co.uk> References: <4B69C7AA.7000904@tuffmail.co.uk> <20100203191112.GC30600@core.coreip.homeip.net> <4B6A9FD7.5040207@tuffmail.co.uk> Date: Tue, 16 Feb 2010 16:48:30 +0000 Message-ID: <9b2b86521002160848q3e75d02aqe432376de2a5b732@mail.gmail.com> Subject: Re: [PATCH] Input: serio - re-add thaw (and add freeze) From: Alan Jenkins To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel 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]); Tue, 16 Feb 2010 16:48:36 +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, };