Skip to content

Commit bbf6264

Browse files
jwrdegoedeJiri Kosina
authored andcommitted
HID: lenovo: Use brightness_set_blocking callback for setting LEDs brightness
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: bc04b37 ("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>
1 parent 69aea9d commit bbf6264

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/hid/hid-lenovo.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ static enum led_brightness lenovo_led_brightness_get(
777777
: LED_OFF;
778778
}
779779

780-
static void lenovo_led_brightness_set(struct led_classdev *led_cdev,
780+
static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
781781
enum led_brightness value)
782782
{
783783
struct device *dev = led_cdev->dev->parent;
@@ -802,6 +802,8 @@ static void lenovo_led_brightness_set(struct led_classdev *led_cdev,
802802
lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value);
803803
break;
804804
}
805+
806+
return 0;
805807
}
806808

807809
static int lenovo_register_leds(struct hid_device *hdev)
@@ -822,15 +824,15 @@ static int lenovo_register_leds(struct hid_device *hdev)
822824

823825
data->led_mute.name = name_mute;
824826
data->led_mute.brightness_get = lenovo_led_brightness_get;
825-
data->led_mute.brightness_set = lenovo_led_brightness_set;
827+
data->led_mute.brightness_set_blocking = lenovo_led_brightness_set;
826828
data->led_mute.dev = &hdev->dev;
827829
ret = led_classdev_register(&hdev->dev, &data->led_mute);
828830
if (ret < 0)
829831
return ret;
830832

831833
data->led_micmute.name = name_micm;
832834
data->led_micmute.brightness_get = lenovo_led_brightness_get;
833-
data->led_micmute.brightness_set = lenovo_led_brightness_set;
835+
data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set;
834836
data->led_micmute.dev = &hdev->dev;
835837
ret = led_classdev_register(&hdev->dev, &data->led_micmute);
836838
if (ret < 0) {

0 commit comments

Comments
 (0)