Commit b38ebd1d authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: LEDs - skip unnamed LEDs

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: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 96849170
...@@ -71,6 +71,18 @@ static void input_leds_event(struct input_handle *handle, unsigned int type, ...@@ -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, static int input_leds_connect(struct input_handler *handler,
struct input_dev *dev, struct input_dev *dev,
const struct input_device_id *id) const struct input_device_id *id)
...@@ -81,7 +93,7 @@ static int input_leds_connect(struct input_handler *handler, ...@@ -81,7 +93,7 @@ static int input_leds_connect(struct input_handler *handler,
int led_no; int led_no;
int error; int error;
num_leds = bitmap_weight(dev->ledbit, LED_CNT); num_leds = input_leds_get_count(dev);
if (!num_leds) if (!num_leds)
return -ENXIO; return -ENXIO;
...@@ -112,7 +124,7 @@ static int input_leds_connect(struct input_handler *handler, ...@@ -112,7 +124,7 @@ static int input_leds_connect(struct input_handler *handler,
led->handle = &leds->handle; led->handle = &leds->handle;
led->code = led_code; led->code = led_code;
if (WARN_ON(!input_led_info[led_code].name)) if (!input_led_info[led_code].name)
continue; continue;
led->cdev.name = kasprintf(GFP_KERNEL, "%s::%s", led->cdev.name = kasprintf(GFP_KERNEL, "%s::%s",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment