Hi Dan,
Thanks for the patch set.
Both patches applied to the for-4.16 branch of linux-leds.git.
Best regards,
Jacek Anaszewski
On 11/15/2017 08:52 PM, Dan Murphy wrote:
> 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@xxxxxx>
> ---
> drivers/leds/leds-lp8860.c | 24 +++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c
> index 91b6c5fbd361..f91a4fe25168 100644
> --- a/drivers/leds/leds-lp8860.c
> +++ b/drivers/leds/leds-lp8860.c
> @@ -247,6 +247,15 @@ static int lp8860_init(struct lp8860_led *led)
> unsigned int read_buf;
> 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)
> gpiod_direction_output(led->enable_gpio, 1);
>
> @@ -282,12 +291,25 @@ static int lp8860_init(struct lp8860_led *led)
> ret = regmap_write(led->regmap,
> LP8860_EEPROM_CNTRL,
> LP8860_PROGRAM_EEPROM);
> - if (ret)
> + if (ret) {
> dev_err(&led->client->dev, "Failed programming EEPROM\n");
> + goto out;
> + }
> +
> + return ret;
> +
> out:
> if (ret)
> if (led->enable_gpio)
> 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;
> }
>
>
