diff options
| author | Antonio Ospite <ospite@studenti.unina.it> | 2011-04-14 15:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-14 16:06:54 -0700 |
| commit | 592ce316395abc6b4e96c1ac198e5f347bb5d578 (patch) | |
| tree | 28281eed393ec50625ff3558956baccb5c4f4ec7 /drivers/leds | |
| parent | d3bc2367180f7ee6afe4ee6e886bfba3ad4eb290 (diff) | |
| download | blackbird-op-linux-592ce316395abc6b4e96c1ac198e5f347bb5d578.tar.gz blackbird-op-linux-592ce316395abc6b4e96c1ac198e5f347bb5d578.zip | |
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: Antonio Ospite <ospite@studenti.unina.it>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Antonio Ospite <ospite@studenti.unina.it>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-regulator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c index 3790816643be..8497f56f8e46 100644 --- a/drivers/leds/leds-regulator.c +++ b/drivers/leds/leds-regulator.c @@ -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); |
