leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: lenovo: Fix lenovo_led_set_tp10ubkbd() error handling

Browse Source 
Fix the following issues with lenovo_led_set_tp10ubkbd() error handling:

1. On success hid_hw_raw_request() returns the number of bytes sent.
   So we should check for (ret != 3) rather then for (ret != 0).

2. Actually propagate errors to the caller.

3. Since the LEDs are part of an USB keyboard-dock the mute LEDs can go
   away at any time. Don't log an error when ret == -ENODEV and set the
   LED_HW_PLUGGABLE flag to avoid errors getting logged when the USB gets
   disconnected.

Fixes: bc04b37ea0 ("HID: lenovo: Add ThinkPad 10 Ultrabook Keyboard support")
Reviewed-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Hans de Goede
2021-04-04 10:04:25 +02:00
committed by Jiri Kosina
parent bbf6264525
commit 658d04e6eb
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/hid/hid-lenovo.c
View File

@@ -62,8 +62,8 @@ struct lenovo_drvdata {
#define TP10UBKBD_LED_OFF 1 #define TP10UBKBD_LED_OFF 1
#define TP10UBKBD_LED_ON 2 #define TP10UBKBD_LED_ON 2
static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code, static int lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,
enum led_brightness value) enum led_brightness value)
{ {
struct lenovo_drvdata *data = hid_get_drvdata(hdev); struct lenovo_drvdata *data = hid_get_drvdata(hdev);
int ret; int ret;
@@ -75,10 +75,18 @@ static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,
data->led_report[2] = value ? TP10UBKBD_LED_ON : TP10UBKBD_LED_OFF; data->led_report[2] = value ? TP10UBKBD_LED_ON : TP10UBKBD_LED_OFF;
ret = hid_hw_raw_request(hdev, data->led_report[0], data->led_report, 3, ret = hid_hw_raw_request(hdev, data->led_report[0], data->led_report, 3,
HID_OUTPUT_REPORT, HID_REQ_SET_REPORT); HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
if (ret) if (ret != 3) {
hid_err(hdev, "Set LED output report error: %d\n", ret); if (ret != -ENODEV)
hid_err(hdev, "Set LED output report error: %d\n", ret);
ret = ret < 0 ? ret : -EIO;
} else {
ret = 0;
}
mutex_unlock(&data->led_report_mutex); mutex_unlock(&data->led_report_mutex);
return ret;
} }
static void lenovo_tp10ubkbd_sync_fn_lock(struct work_struct *work) static void lenovo_tp10ubkbd_sync_fn_lock(struct work_struct *work)
@@ -349,7 +357,7 @@ static ssize_t attr_fn_lock_store(struct device *dev,
{ {
struct hid_device *hdev = to_hid_device(dev); struct hid_device *hdev = to_hid_device(dev);
struct lenovo_drvdata *data = hid_get_drvdata(hdev); struct lenovo_drvdata *data = hid_get_drvdata(hdev);
int value; int value, ret;
if (kstrtoint(buf, 10, &value)) if (kstrtoint(buf, 10, &value))
return -EINVAL; return -EINVAL;
@@ -364,7 +372,9 @@ static ssize_t attr_fn_lock_store(struct device *dev,
lenovo_features_set_cptkbd(hdev); lenovo_features_set_cptkbd(hdev);
break; break;
case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_TP10UBKBD:
lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value); ret = lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value);
if (ret)
return ret;
break; break;
} }
@@ -785,6 +795,7 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev); struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev);
u8 tp10ubkbd_led[] = { TP10UBKBD_MUTE_LED, TP10UBKBD_MICMUTE_LED }; u8 tp10ubkbd_led[] = { TP10UBKBD_MUTE_LED, TP10UBKBD_MICMUTE_LED };
int led_nr = 0; int led_nr = 0;
int ret = 0;
if (led_cdev == &data_pointer->led_micmute) if (led_cdev == &data_pointer->led_micmute)
led_nr = 1; led_nr = 1;
@@ -799,11 +810,11 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
lenovo_led_set_tpkbd(hdev); lenovo_led_set_tpkbd(hdev);
break; break;
case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_TP10UBKBD:
lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value); ret = lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);
break; break;
} }
return 0; return ret;
} }
static int lenovo_register_leds(struct hid_device *hdev) static int lenovo_register_leds(struct hid_device *hdev)
@@ -825,6 +836,7 @@ static int lenovo_register_leds(struct hid_device *hdev)
data->led_mute.name = name_mute; data->led_mute.name = name_mute;
data->led_mute.brightness_get = lenovo_led_brightness_get; data->led_mute.brightness_get = lenovo_led_brightness_get;
data->led_mute.brightness_set_blocking = lenovo_led_brightness_set; data->led_mute.brightness_set_blocking = lenovo_led_brightness_set;
data->led_mute.flags = LED_HW_PLUGGABLE;
data->led_mute.dev = &hdev->dev; data->led_mute.dev = &hdev->dev;
ret = led_classdev_register(&hdev->dev, &data->led_mute); ret = led_classdev_register(&hdev->dev, &data->led_mute);
if (ret < 0) if (ret < 0)
@@ -833,6 +845,7 @@ static int lenovo_register_leds(struct hid_device *hdev)
data->led_micmute.name = name_micm; data->led_micmute.name = name_micm;
data->led_micmute.brightness_get = lenovo_led_brightness_get; data->led_micmute.brightness_get = lenovo_led_brightness_get;
data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set; data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set;
data->led_micmute.flags = LED_HW_PLUGGABLE;
data->led_micmute.dev = &hdev->dev; data->led_micmute.dev = &hdev->dev;
ret = led_classdev_register(&hdev->dev, &data->led_micmute); ret = led_classdev_register(&hdev->dev, &data->led_micmute);
if (ret < 0) { if (ret < 0) {