2012-10-24 07:53:24

by Dan Carpenter

Subject: [patch] ds2782_battery: signedness bug in ds278x_read_reg16()

We need to check for negative values before doing the swab16() for the
error handling to work.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index 6bb6e2f..2fa9b6b 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -80,13 +80,13 @@ static inline int ds278x_read_reg16(struct ds278x_info *info, int reg_msb,
{
int ret;

- ret = swab16(i2c_smbus_read_word_data(info->client, reg_msb));
+ ret = i2c_smbus_read_word_data(info->client, reg_msb);
if (ret < 0) {
dev_err(&info->client->dev, "register read failed\n");
return ret;
}

- *val = ret;
+ *val = swab16(ret);
return 0;
}

2012-11-18 22:50:59

by Anton Vorontsov

Subject: Re: [patch] ds2782_battery: signedness bug in ds278x_read_reg16()

On Wed, Oct 24, 2012 at 10:12:29AM +0300, Dan Carpenter wrote:
> We need to check for negative values before doing the swab16() for the
> error handling to work.
>
> Signed-off-by: Dan Carpenter <[email protected]>

Applied, thanks!

> diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
> index 6bb6e2f..2fa9b6b 100644
> --- a/drivers/power/ds2782_battery.c
> +++ b/drivers/power/ds2782_battery.c
> @@ -80,13 +80,13 @@ static inline int ds278x_read_reg16(struct ds278x_info *info, int reg_msb,
> {
> int ret;
>
> - ret = swab16(i2c_smbus_read_word_data(info->client, reg_msb));
> + ret = i2c_smbus_read_word_data(info->client, reg_msb);
> if (ret < 0) {
> dev_err(&info->client->dev, "register read failed\n");
> return ret;
> }
>
> - *val = ret;
> + *val = swab16(ret);
> return 0;
> }