Skip to content

Commit

Permalink
Input: LEDs - skip unnamed LEDs
Browse files Browse the repository at this point in the history
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-and-tested-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Dmitry Torokhov committed Jul 24, 2015
1 parent 9684917 commit b38ebd1
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions drivers/input/input-leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit b38ebd1

Please sign in to comment.