evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Browse source 
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
This commit is contained in:
Linus Torvalds 2012-06-13 23:18:41 +03:00
commit c02feeea3d
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/leds/Kconfig
View file

@ -379,7 +379,7 @@ config LEDS_NETXBIG
config LEDS_ASIC3 config LEDS_ASIC3
bool "LED support for the HTC ASIC3" bool "LED support for the HTC ASIC3"
depends on LEDS_CLASS depends on LEDS_CLASS=y
depends on MFD_ASIC3 depends on MFD_ASIC3
default y default y
help help
@ -390,7 +390,7 @@ config LEDS_ASIC3
config LEDS_RENESAS_TPU config LEDS_RENESAS_TPU
bool "LED support for Renesas TPU" bool "LED support for Renesas TPU"
depends on LEDS_CLASS && HAVE_CLK && GENERIC_GPIO depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
help help
This option enables build of the LED TPU platform driver, This option enables build of the LED TPU platform driver,
suitable to drive any TPU channel on newer Renesas SoCs. suitable to drive any TPU channel on newer Renesas SoCs.

7
drivers/leds/led-core.c
View file

@ -44,13 +44,6 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
if (!led_cdev->blink_brightness) if (!led_cdev->blink_brightness)
led_cdev->blink_brightness = led_cdev->max_brightness; led_cdev->blink_brightness = led_cdev->max_brightness;
if (led_get_trigger_data(led_cdev) &&
delay_on == led_cdev->blink_delay_on &&
delay_off == led_cdev->blink_delay_off)
return;
led_stop_software_blink(led_cdev);
led_cdev->blink_delay_on = delay_on; led_cdev->blink_delay_on = delay_on;
led_cdev->blink_delay_off = delay_off; led_cdev->blink_delay_off = delay_off;