AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 08:00:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: lp8860: Add regulator enable during init

Browse Source 
Add the regulator enable call during initialization.
If init fails then disable the regulator.

Also during init the gpio gets set low even
on a passing case so add if everything passes
then return.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Dan Murphy 2017-11-15 13:52:13 -06:00 committed by Jacek Anaszewski
parent 8a7a76c800
commit b12ef03a38
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/leds/leds-lp8860.c
View File

@ -247,6 +247,15 @@ static int lp8860_init(struct lp8860_led *led)
unsigned int read_buf; unsigned int read_buf;
int ret, i, reg_count; int ret, i, reg_count;
if (led->regulator) {
ret = regulator_enable(led->regulator);
if (ret) {
dev_err(&led->client->dev,
"Failed to enable regulator\n");
return ret;
}
}
if (led->enable_gpio) if (led->enable_gpio)
gpiod_direction_output(led->enable_gpio, 1); gpiod_direction_output(led->enable_gpio, 1);
@ -282,12 +291,25 @@ static int lp8860_init(struct lp8860_led *led)
ret = regmap_write(led->regmap, ret = regmap_write(led->regmap,
LP8860_EEPROM_CNTRL, LP8860_EEPROM_CNTRL,
LP8860_PROGRAM_EEPROM); LP8860_PROGRAM_EEPROM);
if (ret) if (ret) {
dev_err(&led->client->dev, "Failed programming EEPROM\n"); dev_err(&led->client->dev, "Failed programming EEPROM\n");
goto out;
}
return ret;
out: out:
if (ret) if (ret)
if (led->enable_gpio) if (led->enable_gpio)
gpiod_direction_output(led->enable_gpio, 0); gpiod_direction_output(led->enable_gpio, 0);
if (led->regulator) {
ret = regulator_disable(led->regulator);
if (ret)
dev_err(&led->client->dev,
"Failed to disable regulator\n");
}
return ret; return ret;
} }