diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-10-24 09:12:29 +0200 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-11-18 23:46:39 +0100 |
| commit | 8511748ba1ab83a7d89d802a50335115358a8cfc (patch) | |
| tree | 6a1e43229f4e4831e5d2fac487916baaf4bd0bb9 /drivers/power/ds2782_battery.c | |
| parent | lp8788-charger: Fix ADC channel names (diff) | |
| download | linux-8511748ba1ab83a7d89d802a50335115358a8cfc.tar.xz linux-8511748ba1ab83a7d89d802a50335115358a8cfc.zip | |
ds2782_battery: Fix 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 <dan.carpenter@oracle.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power/ds2782_battery.c')
| -rw-r--r-- | drivers/power/ds2782_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index 6bb6e2f5ea81..2fa9b6bf1f3f 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; } |