From: Dan Murphy <dmurphy@ti.com>
To: "Guido Günther" <agx@sigxcpu.org>,
"Jacek Anaszewski" <jacek.anaszewski@gmail.com>,
"Pavel Machek" <pavel@ucw.cz>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/5] leds: lm3692x: Don't overwrite return value in error path
Date: Fri, 20 Sep 2019 06:48:59 -0500 [thread overview]
Message-ID: <2bde2870-08a3-38b9-9cd7-fee0e2107743@ti.com> (raw)
In-Reply-To: <e3ee36845c1555bd722807f85329341d5ec9728e.1568957104.git.agx@sigxcpu.org>
Guido
On 9/20/19 12:27 AM, Guido Günther wrote:
> The driver currently reports successful initialization on every failure
> as long as it's able to power off the regulator. Don't check the return
> value of regulator_disable to avoid that.
>
> Signed-off-by: Guido Günther <agx@sigxcpu.org>
> ---
> drivers/leds/leds-lm3692x.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
> index 487228c2bed2..31115655f97b 100644
> --- a/drivers/leds/leds-lm3692x.c
> +++ b/drivers/leds/leds-lm3692x.c
> @@ -198,7 +198,7 @@ static int lm3692x_brightness_set(struct led_classdev *led_cdev,
> static int lm3692x_init(struct lm3692x_led *led)
> {
> int enable_state;
> - int ret;
> + int ret, ret2;
>
> if (led->regulator) {
> ret = regulator_enable(led->regulator);
> @@ -313,14 +313,15 @@ static int lm3692x_init(struct lm3692x_led *led)
> gpiod_direction_output(led->enable_gpio, 0);
>
> if (led->regulator) {
> - ret = regulator_disable(led->regulator);
> - if (ret)
> + ret2 = regulator_disable(led->regulator);
> + if (ret2)
> dev_err(&led->client->dev,
> "Failed to disable regulator\n");
s/ret2/reg_ret
Like you did in patch 1 log the error code as well.
If regulator_disabled failed you might want to send that error code but
either error returned is fine.
Dan
> }
>
> return ret;
> }
> +
> static int lm3692x_probe_dt(struct lm3692x_led *led)
> {
> struct fwnode_handle *child = NULL;
next prev parent reply other threads:[~2019-09-20 11:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 5:27 [PATCH v2 0/5] leds: lm3692x: Probing and flag fixes Guido Günther
2019-09-20 5:27 ` [PATCH v2 1/5] leds: lm3692x: Print error value on dev_err Guido Günther
2019-09-20 5:27 ` [PATCH v2 2/5] leds: lm3692x: Don't overwrite return value in error path Guido Günther
2019-09-20 11:47 ` Pavel Machek
2019-09-20 11:48 ` Dan Murphy [this message]
2019-09-21 21:15 ` Guido Günther
2019-09-20 5:27 ` [PATCH v2 3/5] leds: lm3692x: Handle failure to probe the regulator Guido Günther
2019-09-20 5:27 ` [PATCH v2 4/5] leds: lm3692x: Use flags from LM3692X_BOOST_CTRL Guido Günther
2019-09-20 5:27 ` [PATCH v2 5/5] leds: lm3692x: Use flags from LM3692X_BRT_CTRL Guido Günther
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2bde2870-08a3-38b9-9cd7-fee0e2107743@ti.com \
--to=dmurphy@ti.com \
--cc=agx@sigxcpu.org \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox