Skip to content

Commit 658d04e

Browse files
jwrdegoedeJiri Kosina
authored andcommitted
HID: lenovo: Fix lenovo_led_set_tp10ubkbd() error handling
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: bc04b37 ("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>
1 parent bbf6264 commit 658d04e

1 file changed

Lines changed: 21 additions & 8 deletions

File tree

drivers/hid/hid-lenovo.c

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ struct lenovo_drvdata {
6262
#define TP10UBKBD_LED_OFF 1
6363
#define TP10UBKBD_LED_ON 2
6464

65-
static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,
66-
enum led_brightness value)
65+
static int lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,
66+
enum led_brightness value)
6767
{
6868
struct lenovo_drvdata *data = hid_get_drvdata(hdev);
6969
int ret;
@@ -75,10 +75,18 @@ static void lenovo_led_set_tp10ubkbd(struct hid_device *hdev, u8 led_code,
7575
data->led_report[2] = value ? TP10UBKBD_LED_ON : TP10UBKBD_LED_OFF;
7676
ret = hid_hw_raw_request(hdev, data->led_report[0], data->led_report, 3,
7777
HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
78-
if (ret)
79-
hid_err(hdev, "Set LED output report error: %d\n", ret);
78+
if (ret != 3) {
79+
if (ret != -ENODEV)
80+
hid_err(hdev, "Set LED output report error: %d\n", ret);
81+
82+
ret = ret < 0 ? ret : -EIO;
83+
} else {
84+
ret = 0;
85+
}
8086

8187
mutex_unlock(&data->led_report_mutex);
88+
89+
return ret;
8290
}
8391

8492
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,
349357
{
350358
struct hid_device *hdev = to_hid_device(dev);
351359
struct lenovo_drvdata *data = hid_get_drvdata(hdev);
352-
int value;
360+
int value, ret;
353361

354362
if (kstrtoint(buf, 10, &value))
355363
return -EINVAL;
@@ -364,7 +372,9 @@ static ssize_t attr_fn_lock_store(struct device *dev,
364372
lenovo_features_set_cptkbd(hdev);
365373
break;
366374
case USB_DEVICE_ID_LENOVO_TP10UBKBD:
367-
lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value);
375+
ret = lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value);
376+
if (ret)
377+
return ret;
368378
break;
369379
}
370380

@@ -785,6 +795,7 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
785795
struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev);
786796
u8 tp10ubkbd_led[] = { TP10UBKBD_MUTE_LED, TP10UBKBD_MICMUTE_LED };
787797
int led_nr = 0;
798+
int ret = 0;
788799

789800
if (led_cdev == &data_pointer->led_micmute)
790801
led_nr = 1;
@@ -799,11 +810,11 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
799810
lenovo_led_set_tpkbd(hdev);
800811
break;
801812
case USB_DEVICE_ID_LENOVO_TP10UBKBD:
802-
lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);
813+
ret = lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);
803814
break;
804815
}
805816

806-
return 0;
817+
return ret;
807818
}
808819

809820
static int lenovo_register_leds(struct hid_device *hdev)
@@ -825,6 +836,7 @@ static int lenovo_register_leds(struct hid_device *hdev)
825836
data->led_mute.name = name_mute;
826837
data->led_mute.brightness_get = lenovo_led_brightness_get;
827838
data->led_mute.brightness_set_blocking = lenovo_led_brightness_set;
839+
data->led_mute.flags = LED_HW_PLUGGABLE;
828840
data->led_mute.dev = &hdev->dev;
829841
ret = led_classdev_register(&hdev->dev, &data->led_mute);
830842
if (ret < 0)
@@ -833,6 +845,7 @@ static int lenovo_register_leds(struct hid_device *hdev)
833845
data->led_micmute.name = name_micm;
834846
data->led_micmute.brightness_get = lenovo_led_brightness_get;
835847
data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set;
848+
data->led_micmute.flags = LED_HW_PLUGGABLE;
836849
data->led_micmute.dev = &hdev->dev;
837850
ret = led_classdev_register(&hdev->dev, &data->led_micmute);
838851
if (ret < 0) {

0 commit comments

Comments
 (0)