From patchwork Wed Nov 11 09:52:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 59299 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAB9qQtw018787 for ; Wed, 11 Nov 2009 09:52:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756173AbZKKJwT (ORCPT ); Wed, 11 Nov 2009 04:52:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754377AbZKKJwT (ORCPT ); Wed, 11 Nov 2009 04:52:19 -0500 Received: from mail-pz0-f188.google.com ([209.85.222.188]:58826 "EHLO mail-pz0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753531AbZKKJwS (ORCPT ); Wed, 11 Nov 2009 04:52:18 -0500 Received: by pzk26 with SMTP id 26so645349pzk.4 for ; Wed, 11 Nov 2009 01:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=le+LaohXEmC0DFChGhLbYGklvUAutgxEmbBoNMvHe7o=; b=ly6c6q6uTlx0KfdcZlaiZOuWYmkOCtoXGUUQNLPMCCZLw9+87h7Mx3kxNY1tbUBnWc KcwGDVENLOj6Kr/WLmTAyK5LCDgd5X2MG+WyKKM/zgq59CeGYs11dtpaoULPHsKKpkGe 4Npn0LevfAji5AF4GglfuiX5zJeycz5Q7bId0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=mz5kchlUvvMDUyiDHRfo9YfHbP9NlwI8n4PNlhWYdTIsSHyi8hqbKVDqxkHIerpbQM LWPq7oN76k0cNfjznCXPZFvXb79kPAo2FWORp4Zvqe9oTzVMT78tOBGOaPL8ZKQ/e8H9 AMi+QMUdVCYLx387rGW3MlB2TcS/dG40tr+ho= Received: by 10.114.119.6 with SMTP id r6mr2781751wac.45.1257933143953; Wed, 11 Nov 2009 01:52:23 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 20sm992756pxi.15.2009.11.11.01.52.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Nov 2009 01:52:22 -0800 (PST) Date: Wed, 11 Nov 2009 01:52:19 -0800 From: Dmitry Torokhov To: Mikko Vinni Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: keyboard leds not restored after s2ram in 2.6.32-rc6-00166-g799dd75 Message-ID: <20091111095218.GA3654@core.coreip.homeip.net> References: <761296.29412.qm@web58402.mail.re3.yahoo.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <761296.29412.qm@web58402.mail.re3.yahoo.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/input.c b/drivers/input/input.c index 61069b2..77b6efe 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1298,17 +1298,24 @@ static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env) return 0; } -#define INPUT_DO_TOGGLE(dev, type, bits, on) \ - do { \ - int i; \ - if (!test_bit(EV_##type, dev->evbit)) \ - break; \ - for (i = 0; i < type##_MAX; i++) { \ - if (!test_bit(i, dev->bits##bit) || \ - !test_bit(i, dev->bits)) \ - continue; \ - dev->event(dev, EV_##type, i, on); \ - } \ +#define INPUT_DO_TOGGLE(dev, type, bits, on) \ + do { \ + int i; \ + bool active; \ + \ + if (!test_bit(EV_##type, dev->evbit)) \ + break; \ + \ + for (i = 0; i < type##_MAX; i++) { \ + if (!test_bit(i, dev->bits##bit)) \ + continue; \ + \ + active = test_bit(i, dev->bits); \ + if (!active && !on) \ + continue; \ + \ + dev->event(dev, EV_##type, i, on ? active : 0); \ + } \ } while (0) #ifdef CONFIG_PM