summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-17 20:06:57 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-17 20:06:57 +0300
commit7af9a17034ffc13117834d60b4a6f2c757e3c0b4 (patch)
tree4f16f5b24f8c09405b3544340a3b2d2c92206e71 /Documentation
parentbb967271c0317de8eed56b20aae978d31507b033 (diff)
parent5ab92a7cb82c66bf30685583a38a18538e3807db (diff)
downloadlinux-7af9a17034ffc13117834d60b4a6f2c757e3c0b4.tar.xz
Merge tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
Pull LED fixes from Jacek Anaszewski: - Fix brightness setting upon hardware blinking enabled - Handle suspend/resume in heartbeat trigger * tag 'for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds: leds: handle suspend/resume in heartbeat trigger leds: core: Fix brightness setting upon hardware blinking enabled
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/leds/leds-class.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt
index d406d98339b2..44f5e6bccd97 100644
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
@@ -74,8 +74,8 @@ blink_set() function (see <linux/leds.h>). To set an LED to blinking,
however, it is better to use the API function led_blink_set(), as it
will check and implement software fallback if necessary.
-To turn off blinking again, use the API function led_brightness_set()
-as that will not just set the LED brightness but also stop any software
+To turn off blinking, use the API function led_brightness_set()
+with brightness value LED_OFF, which should stop any software
timers that may have been required for blinking.
The blink_set() function should choose a user friendly blinking value