Commit 9d3c0663 authored Nov 16, 2015 by Simon Arlott Committed by Jacek Anaszewski Jan 04, 2016

leds: bcm6328: Reuse bcm6328_led_set() instead of copying its functionality



When ensuring a consistent initial LED state in bcm6328_led (as they may
be blinking instead of on/off), the LED register is set using an inverted
copy of bcm6328_led_set(). To avoid further errors relating to active low
handling, call this function directly instead.

As bcm6328_led_set() acquires the same spinlock again when updating the
register, it is called after unlocking.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

parent c29e650b

drivers/leds/leds-bcm6328.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -314,14 +314,10 @@ static int bcm6328_led(struct device dev, struct device_node nc, u32 reg,
		} else {
		led->cdev.brightness = LED_OFF;
		}

		if ((led->active_low && led->cdev.brightness == LED_FULL) \|\|
		(!led->active_low && led->cdev.brightness == LED_OFF))
		bcm6328_led_mode(led, BCM6328_LED_MODE_ON);
		else
		bcm6328_led_mode(led, BCM6328_LED_MODE_OFF);
		spin_unlock_irqrestore(lock, flags);

		bcm6328_led_set(&led->cdev, led->cdev.brightness);

		led->cdev.brightness_set = bcm6328_led_set;
		led->cdev.blink_set = bcm6328_blink_set;