Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull led fixes from Bryan Wu.
* 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
leds: Make LEDS_ASIC3 and LEDS_RENESAS_TPU depend on LEDS_CLASS=y
leds: fixed a coding style issue.
leds: don't disable blinking when writing the same value to delay_on or delay_off
+3
-10
+2
-2
drivers/leds/Kconfig
+2
-2
drivers/leds/Kconfig
···
379
379
380
380
config LEDS_ASIC3
381
381
bool "LED support for the HTC ASIC3"
382
-
depends on LEDS_CLASS
382
+
depends on LEDS_CLASS=y
383
383
depends on MFD_ASIC3
384
384
default y
385
385
help
···
390
390
391
391
config LEDS_RENESAS_TPU
392
392
bool "LED support for Renesas TPU"
393
-
depends on LEDS_CLASS && HAVE_CLK && GENERIC_GPIO
393
+
depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
394
394
help
395
395
This option enables build of the LED TPU platform driver,
396
396
suitable to drive any TPU channel on newer Renesas SoCs.
+1
-1
drivers/leds/led-class.c
+1
-1
drivers/leds/led-class.c
···
29
29
led_cdev->brightness = led_cdev->brightness_get(led_cdev);
30
30
}
31
31
32
-
static ssize_t led_brightness_show(struct device *dev,
32
+
static ssize_t led_brightness_show(struct device *dev,
33
33
struct device_attribute *attr, char *buf)
34
34
{
35
35
struct led_classdev *led_cdev = dev_get_drvdata(dev);
-7
drivers/leds/led-core.c
-7
drivers/leds/led-core.c
···
44
44
if (!led_cdev->blink_brightness)
45
45
led_cdev->blink_brightness = led_cdev->max_brightness;
46
46
47
-
if (led_get_trigger_data(led_cdev) &&
48
-
delay_on == led_cdev->blink_delay_on &&
49
-
delay_off == led_cdev->blink_delay_off)
50
-
return;
51
-
52
-
led_stop_software_blink(led_cdev);
53
-
54
47
led_cdev->blink_delay_on = delay_on;
55
48
led_cdev->blink_delay_off = delay_off;
56
49