.. | .. |
---|
95 | 95 | struct hid_device *hdev; |
---|
96 | 96 | struct work_struct work; |
---|
97 | 97 | unsigned int brightness; |
---|
| 98 | + spinlock_t lock; |
---|
98 | 99 | bool removed; |
---|
99 | 100 | }; |
---|
100 | 101 | |
---|
.. | .. |
---|
397 | 398 | return ret; |
---|
398 | 399 | } |
---|
399 | 400 | |
---|
| 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 | + |
---|
400 | 411 | static void asus_kbd_backlight_set(struct led_classdev *led_cdev, |
---|
401 | 412 | enum led_brightness brightness) |
---|
402 | 413 | { |
---|
403 | 414 | struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds, |
---|
404 | 415 | cdev); |
---|
405 | | - if (led->brightness == brightness) |
---|
406 | | - return; |
---|
| 416 | + unsigned long flags; |
---|
407 | 417 | |
---|
| 418 | + spin_lock_irqsave(&led->lock, flags); |
---|
408 | 419 | led->brightness = brightness; |
---|
409 | | - schedule_work(&led->work); |
---|
| 420 | + spin_unlock_irqrestore(&led->lock, flags); |
---|
| 421 | + |
---|
| 422 | + asus_schedule_work(led); |
---|
410 | 423 | } |
---|
411 | 424 | |
---|
412 | 425 | static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev) |
---|
413 | 426 | { |
---|
414 | 427 | struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds, |
---|
415 | 428 | cdev); |
---|
| 429 | + enum led_brightness brightness; |
---|
| 430 | + unsigned long flags; |
---|
416 | 431 | |
---|
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; |
---|
418 | 437 | } |
---|
419 | 438 | |
---|
420 | 439 | static void asus_kbd_backlight_work(struct work_struct *work) |
---|
.. | .. |
---|
422 | 441 | struct asus_kbd_leds *led = container_of(work, struct asus_kbd_leds, work); |
---|
423 | 442 | u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, 0x00 }; |
---|
424 | 443 | int ret; |
---|
| 444 | + unsigned long flags; |
---|
425 | 445 | |
---|
426 | | - if (led->removed) |
---|
427 | | - return; |
---|
428 | | - |
---|
| 446 | + spin_lock_irqsave(&led->lock, flags); |
---|
429 | 447 | buf[4] = led->brightness; |
---|
| 448 | + spin_unlock_irqrestore(&led->lock, flags); |
---|
430 | 449 | |
---|
431 | 450 | ret = asus_kbd_set_report(led->hdev, buf, sizeof(buf)); |
---|
432 | 451 | if (ret < 0) |
---|
.. | .. |
---|
488 | 507 | drvdata->kbd_backlight->cdev.brightness_set = asus_kbd_backlight_set; |
---|
489 | 508 | drvdata->kbd_backlight->cdev.brightness_get = asus_kbd_backlight_get; |
---|
490 | 509 | INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work); |
---|
| 510 | + spin_lock_init(&drvdata->kbd_backlight->lock); |
---|
491 | 511 | |
---|
492 | 512 | ret = devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->cdev); |
---|
493 | 513 | if (ret < 0) { |
---|
.. | .. |
---|
1016 | 1036 | static void asus_remove(struct hid_device *hdev) |
---|
1017 | 1037 | { |
---|
1018 | 1038 | struct asus_drvdata *drvdata = hid_get_drvdata(hdev); |
---|
| 1039 | + unsigned long flags; |
---|
1019 | 1040 | |
---|
1020 | 1041 | if (drvdata->kbd_backlight) { |
---|
| 1042 | + spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags); |
---|
1021 | 1043 | drvdata->kbd_backlight->removed = true; |
---|
| 1044 | + spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags); |
---|
| 1045 | + |
---|
1022 | 1046 | cancel_work_sync(&drvdata->kbd_backlight->work); |
---|
1023 | 1047 | } |
---|
1024 | 1048 | |
---|