From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Machek Subject: Re: [PATCH] Input: LEDs - skip unnamed LEDs Date: Thu, 23 Jul 2015 08:19:13 +0200 Message-ID: <20150723061913.GA28175@amd> References: <20150722220202.GG14875@dtor-ws> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:54303 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750842AbbGWGTP (ORCPT ); Thu, 23 Jul 2015 02:19:15 -0400 Content-Disposition: inline In-Reply-To: <20150722220202.GG14875@dtor-ws> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov Cc: Vlastimil Babka , Jiri Kosina , Samuel Thibault , Pali =?iso-8859-1?Q?Roh=E1r?= , linux-input@vger.kernel.org, rpurdie@rpsys.net, Greg Kroah-Hartman , linux-kernel@vger.kernel.org On Wed 2015-07-22 15:02:02, Dmitry Torokhov wrote: > Devices may declare more LEDs than what is known to input-leds > (HID does this for some devices). Instead of showing ugly warnings > on connect and, even worse, oopsing on disconnect, let's simply > ignore LEDs that are not known to us. > > Reported-by: Vlastimil Babka > Signed-off-by: Dmitry Torokhov > --- > drivers/input/input-leds.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c > index 074a65e..766bf26 100644 > --- a/drivers/input/input-leds.c > +++ b/drivers/input/input-leds.c > @@ -71,6 +71,18 @@ static void input_leds_event(struct input_handle *handle, unsigned int type, > { > } > > +static int input_leds_get_count(struct input_dev *dev) > +{ > + unsigned int led_code; > + int count = 0; > + > + for_each_set_bit(led_code, dev->ledbit, LED_CNT) > + if (input_led_info[led_code].name) > + count++; > + > + return count; > +} > + > static int input_leds_connect(struct input_handler *handler, > struct input_dev *dev, > const struct input_device_id *id) > @@ -81,7 +93,7 @@ static int input_leds_connect(struct input_handler *handler, > int led_no; > int error; > > - num_leds = bitmap_weight(dev->ledbit, LED_CNT); > + num_leds = input_leds_get_count(dev); > if (!num_leds) > return -ENXIO; > > @@ -112,7 +124,7 @@ static int input_leds_connect(struct input_handler *handler, > led->handle = &leds->handle; > led->code = led_code; > > - if (WARN_ON(!input_led_info[led_code].name)) > + if (!input_led_info[led_code].name) > continue; > > led->cdev.name = kasprintf(GFP_KERNEL, "%s::%s", > Are you sure? AFAICT you need to fix err_unregister_leds not to unregister leds with no name... Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html