Merge "leds: triggers: Don't remove trigger if LED_KEEP_TRIGGER flag is set"

drivers/leds/led-triggers.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,8 @@ ssize_t led_trigger_store(struct device dev, struct device_attribute attr,
		goto unlock;
		}

		if (sysfs_streq(buf, "none")) {
		if (sysfs_streq(buf, "none") &&
		!(led_cdev->flags & LED_KEEP_TRIGGER)) {
		led_trigger_remove(led_cdev);
		goto unlock;
		}