Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 592ce316 authored by Antonio Ospite's avatar Antonio Ospite Committed by Linus Torvalds
Browse files

leds/leds-regulator.c: fix handling of already enabled regulators 



Make the driver aware of the initial status of the regulator.

The leds-regulator driver was ignoring the initial status of the
regulator; this resulted in rdev->use_count being incremented to 2 after
calling regulator_led_set_value() in the .probe method when a regulator
was already enabled at insmod time, which made it impossible to ever
disable the regulator.

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Antonio Ospite <ospite@studenti.unina.it>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d3bc2367

drivers/leds/leds-regulator.c

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ static int __devinit regulator_led_probe(struct platform_device *pdev) 
	led->cdev.flags |= LED_CORE_SUSPENDRESUME;

	led->vcc = vcc;



	/* to handle correctly an already enabled regulator */

	if (regulator_is_enabled(led->vcc))

		led->enabled = 1;



	mutex_init(&led->mutex);

	INIT_WORK(&led->work, led_work);