github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

HID: lenovo: Use brightness_set_blocking callback for setting LEDs brightness

Browse Source 
[ Upstream commit bbf6264525 ]

The lenovo_led_brightness_set function may sleep, so we should have the
the led_class_dev's brightness_set_blocking callback point to it, rather
then the regular brightness_set callback.

When toggled through sysfs this is not a problem, but the brightness_set
callback may be called from atomic context when using LED-triggers.

Fixes: bc04b37ea0 ("HID: lenovo: Add ThinkPad 10 Ultrabook Keyboard support")
Reviewed-by: Marek Behún <kabel@kernel.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans de Goede 2021-04-04 10:04:24 +02:00 committed by Greg Kroah-Hartman
parent 716132e00c
commit 29bfd0446a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,7 @@ static enum led_brightness lenovo_led_brightness_get(
: LED_OFF; : LED_OFF;
} }
static void lenovo_led_brightness_set(struct led_classdev *led_cdev, static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
struct device *dev = led_cdev->dev->parent; struct device *dev = led_cdev->dev->parent;
@ -802,6 +802,8 @@ static void lenovo_led_brightness_set(struct led_classdev *led_cdev,
lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value); lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);
break; break;
} }
return 0;
} }
static int lenovo_register_leds(struct hid_device *hdev) static int lenovo_register_leds(struct hid_device *hdev)
@ -822,7 +824,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 = lenovo_led_brightness_set; data->led_mute.brightness_set_blocking = lenovo_led_brightness_set;
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)
@ -830,7 +832,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 = lenovo_led_brightness_set; data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set;
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) {