* [PATCH] regulator: ad5398: Fix return value of ad5398_write_reg
@ 2016-02-11 10:17 Axel Lin
2016-02-12 11:42 ` Michael Hennerich
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2016-02-11 10:17 UTC (permalink / raw)
To: Mark Brown; +Cc: Michael Hennerich, Liam Girdwood, Sonic Zhang, linux-kernel
i2c_master_send() returns the number of bytes written on success.
So current code returns 2 if ad5398_write_reg() success.
This return value is propagated to .set_current_limit, .enable and .disable
callbacks of regulator_ops. This can be a problem, for example, if the
users test if the return value of regulator_set_current_limit() is 0.
Fix it by making ad5398_write_reg() return 0 on success.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/ad5398.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index ea50a88..8b0f788 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -58,10 +58,12 @@ static int ad5398_write_reg(struct i2c_client *client, const unsigned short data
val = cpu_to_be16(data);
ret = i2c_master_send(client, (char *)&val, 2);
- if (ret < 0)
+ if (ret != 2) {
dev_err(&client->dev, "I2C write error\n");
+ return ret < 0 ? ret : -EIO;
+ }
- return ret;
+ return 0;
}
static int ad5398_get_current_limit(struct regulator_dev *rdev)
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] regulator: ad5398: Fix return value of ad5398_write_reg
2016-02-11 10:17 [PATCH] regulator: ad5398: Fix return value of ad5398_write_reg Axel Lin
@ 2016-02-12 11:42 ` Michael Hennerich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Hennerich @ 2016-02-12 11:42 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: Liam Girdwood, Sonic Zhang, linux-kernel
On 02/11/2016 11:17 AM, Axel Lin wrote:
> i2c_master_send() returns the number of bytes written on success.
> So current code returns 2 if ad5398_write_reg() success.
> This return value is propagated to .set_current_limit, .enable and .disable
> callbacks of regulator_ops. This can be a problem, for example, if the
> users test if the return value of regulator_set_current_limit() is 0.
> Fix it by making ad5398_write_reg() return 0 on success.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
> drivers/regulator/ad5398.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
> index ea50a88..8b0f788 100644
> --- a/drivers/regulator/ad5398.c
> +++ b/drivers/regulator/ad5398.c
> @@ -58,10 +58,12 @@ static int ad5398_write_reg(struct i2c_client *client, const unsigned short data
>
> val = cpu_to_be16(data);
> ret = i2c_master_send(client, (char *)&val, 2);
> - if (ret < 0)
> + if (ret != 2) {
> dev_err(&client->dev, "I2C write error\n");
> + return ret < 0 ? ret : -EIO;
> + }
>
> - return ret;
> + return 0;
> }
>
> static int ad5398_get_current_limit(struct regulator_dev *rdev)
>
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-12 12:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 10:17 [PATCH] regulator: ad5398: Fix return value of ad5398_write_reg Axel Lin
2016-02-12 11:42 ` Michael Hennerich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).