hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/drivers/hid/hid-asus.c
....@@ -95,6 +95,7 @@
9595 struct hid_device *hdev;
9696 struct work_struct work;
9797 unsigned int brightness;
98
+ spinlock_t lock;
9899 bool removed;
99100 };
100101
....@@ -397,24 +398,42 @@
397398 return ret;
398399 }
399400
401
+static void asus_schedule_work(struct asus_kbd_leds *led)
402
+{
403
+ unsigned long flags;
404
+
405
+ spin_lock_irqsave(&led->lock, flags);
406
+ if (!led->removed)
407
+ schedule_work(&led->work);
408
+ spin_unlock_irqrestore(&led->lock, flags);
409
+}
410
+
400411 static void asus_kbd_backlight_set(struct led_classdev *led_cdev,
401412 enum led_brightness brightness)
402413 {
403414 struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
404415 cdev);
405
- if (led->brightness == brightness)
406
- return;
416
+ unsigned long flags;
407417
418
+ spin_lock_irqsave(&led->lock, flags);
408419 led->brightness = brightness;
409
- schedule_work(&led->work);
420
+ spin_unlock_irqrestore(&led->lock, flags);
421
+
422
+ asus_schedule_work(led);
410423 }
411424
412425 static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev)
413426 {
414427 struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds,
415428 cdev);
429
+ enum led_brightness brightness;
430
+ unsigned long flags;
416431
417
- return led->brightness;
432
+ spin_lock_irqsave(&led->lock, flags);
433
+ brightness = led->brightness;
434
+ spin_unlock_irqrestore(&led->lock, flags);
435
+
436
+ return brightness;
418437 }
419438
420439 static void asus_kbd_backlight_work(struct work_struct *work)
....@@ -422,11 +441,11 @@
422441 struct asus_kbd_leds *led = container_of(work, struct asus_kbd_leds, work);
423442 u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, 0x00 };
424443 int ret;
444
+ unsigned long flags;
425445
426
- if (led->removed)
427
- return;
428
-
446
+ spin_lock_irqsave(&led->lock, flags);
429447 buf[4] = led->brightness;
448
+ spin_unlock_irqrestore(&led->lock, flags);
430449
431450 ret = asus_kbd_set_report(led->hdev, buf, sizeof(buf));
432451 if (ret < 0)
....@@ -488,6 +507,7 @@
488507 drvdata->kbd_backlight->cdev.brightness_set = asus_kbd_backlight_set;
489508 drvdata->kbd_backlight->cdev.brightness_get = asus_kbd_backlight_get;
490509 INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work);
510
+ spin_lock_init(&drvdata->kbd_backlight->lock);
491511
492512 ret = devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->cdev);
493513 if (ret < 0) {
....@@ -1016,9 +1036,13 @@
10161036 static void asus_remove(struct hid_device *hdev)
10171037 {
10181038 struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
1039
+ unsigned long flags;
10191040
10201041 if (drvdata->kbd_backlight) {
1042
+ spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags);
10211043 drvdata->kbd_backlight->removed = true;
1044
+ spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags);
1045
+
10221046 cancel_work_sync(&drvdata->kbd_backlight->work);
10231047 }
10241048