Commit c02feeea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6ddb9904 9473c4c1

drivers/leds/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ config LEDS_NETXBIG 


config LEDS_ASIC3

	bool "LED support for the HTC ASIC3"

	depends on LEDS_CLASS

	depends on LEDS_CLASS=y

	depends on MFD_ASIC3

	default y

	help
@@ -390,7 +390,7 @@ config LEDS_ASIC3 


config LEDS_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

	  This option enables build of the LED TPU platform driver,

	  suitable to drive any TPU channel on newer Renesas SoCs.

drivers/leds/led-core.c

+0 −7
Original line number Diff line number Diff line
@@ -44,13 +44,6 @@ static void led_set_software_blink(struct led_classdev *led_cdev, 
	if (!led_cdev->blink_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_off = delay_off;

drivers/leds/led-class.c

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE