diff options
| author |   Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2018-03-12 14:35:10 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2018-03-12 14:35:10 +0100 |
| commit | 75dd56c0cd68847809e6e75d6fcc234e6e6711d5 (patch) | |
| tree | c1c3b11bff4bf0b11e9c8d7720a02513d996e2cd /drivers/power/supply/ltc2941-battery-gauge.c | |
| parent | power: supply: da9150-fg: remove VLA usage (diff) | |
| parent | power: supply: bq27xxx: support missing supplier device (diff) | |
| download | linux-dev-75dd56c0cd68847809e6e75d6fcc234e6e6711d5.tar.xz linux-dev-75dd56c0cd68847809e6e75d6fcc234e6e6711d5.zip | |
Merge branch 'fixes' into for-next
Merge for-stable fixes branch into for-next development branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply/ltc2941-battery-gauge.c')
| -rw-r--r-- | drivers/power/supply/ltc2941-battery-gauge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/supply/ltc2941-battery-gauge.c b/drivers/power/supply/ltc2941-battery-gauge.c index 9360faca7026..4f129bb4c972 100644 --- a/drivers/power/supply/ltc2941-battery-gauge.c +++ b/drivers/power/supply/ltc2941-battery-gauge.c @@ -341,15 +341,15 @@ static int ltc294x_get_temperature(const struct ltc294x_info *info, int *val) if (info->id == LTC2942_ID) { reg = LTC2942_REG_TEMPERATURE_MSB; - value = 60000; /* Full-scale is 600 Kelvin */ + value = 6000; /* Full-scale is 600 Kelvin */ } else { reg = LTC2943_REG_TEMPERATURE_MSB; - value = 51000; /* Full-scale is 510 Kelvin */ + value = 5100; /* Full-scale is 510 Kelvin */ } ret = ltc294x_read_regs(info->client, reg, &datar[0], 2); value *= (datar[0] << 8) | datar[1]; - /* Convert to centidegrees */ - *val = value / 0xFFFF - 27215; + /* Convert to tenths of degree Celsius */ + *val = value / 0xFFFF - 2722; return ret; } |