Unverified Commit 4871289b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10954 leds: trigger: Unregister sysfs attributes before calling deactivate() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KQ2JYXDQXKU654AU5IBLXYHNIVK76IVI/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ89 
 
Link:https://gitee.com/openeuler/kernel/pulls/10954

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 36fe9923 21668176

drivers/leds/led-triggers.c

+1 −1
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) 
			flags);

		cancel_work_sync(&led_cdev->set_brightness_work);

		led_stop_software_blink(led_cdev);

		device_remove_groups(led_cdev->dev, led_cdev->trigger->groups);

		if (led_cdev->trigger->deactivate)

			led_cdev->trigger->deactivate(led_cdev);

		device_remove_groups(led_cdev->dev, led_cdev->trigger->groups);

		led_cdev->trigger = NULL;

		led_cdev->trigger_data = NULL;

		led_cdev->activated = false;