From: Pavel Machek <pavel@ucw.cz>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "Vlastimil Babka" <vbabka@suse.cz>,
"Jiri Kosina" <jkosina@suse.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
"Pali Rohár" <pali.rohar@gmail.com>,
linux-input@vger.kernel.org, rpurdie@rpsys.net,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: LEDs - skip unnamed LEDs
Date: Thu, 23 Jul 2015 08:19:13 +0200 [thread overview]
Message-ID: <20150723061913.GA28175@amd> (raw)
In-Reply-To: <20150722220202.GG14875@dtor-ws>
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 <vbabka@suse.cz>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> 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
next prev parent reply other threads:[~2015-07-23 6:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 22:02 [PATCH] Input: LEDs - skip unnamed LEDs Dmitry Torokhov
2015-07-23 5:40 ` Vlastimil Babka
2015-07-23 6:19 ` Pavel Machek [this message]
2015-07-23 20:57 ` Dmitry Torokhov
2015-07-23 21:22 ` Pavel Machek
2015-07-23 21:36 ` Dmitry Torokhov
2015-07-24 8:22 ` Vlastimil Babka
2015-07-24 8:48 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150723061913.GA28175@amd \
--to=pavel@ucw.cz \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jkosina@suse.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=rpurdie@rpsys.net \
--cc=samuel.thibault@ens-lyon.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).