Hi,

On Fri, Nov 16, 2018 at 05:23:47PM +0100, Lubomir Rintel wrote:
> According to [1] and [2], the temperature values are in tenths of degree
> Celsius. Exposing the Celsius value makes the battery appear on fire:
> 
>   $ upower -i /org/freedesktop/UPower/devices/battery_olpc_battery
>   ...
>       temperature:         236.9 degrees C
> 
> Tested on OLPC XO-1 and OLPC XO-1.75 laptops.
> 
> [1] include/linux/power_supply.h
> [2] Documentation/power/power_supply_class.txt
> 
> Fixes: fb972873a767 ("[BATTERY] One Laptop Per Child power/battery driver")
> Cc: sta...@vger.kernel.org
> Signed-off-by: Lubomir Rintel <lkund...@v3.sk>
> Acked-by: Pavel Machek <pa...@ucw.cz>
> 
> ---

This is queued to next.

-- Sebastian

> Changes since v1:
> - Add Fixes tag and an Ack
> 
>  drivers/power/supply/olpc_battery.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/supply/olpc_battery.c 
> b/drivers/power/supply/olpc_battery.c
> index 6da79ae14860..5a97e42a3547 100644
> --- a/drivers/power/supply/olpc_battery.c
> +++ b/drivers/power/supply/olpc_battery.c
> @@ -428,14 +428,14 @@ static int olpc_bat_get_property(struct power_supply 
> *psy,
>               if (ret)
>                       return ret;
>  
> -             val->intval = (s16)be16_to_cpu(ec_word) * 100 / 256;
> +             val->intval = (s16)be16_to_cpu(ec_word) * 10 / 256;
>               break;
>       case POWER_SUPPLY_PROP_TEMP_AMBIENT:
>               ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
>               if (ret)
>                       return ret;
>  
> -             val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
> +             val->intval = (int)be16_to_cpu(ec_word) * 10 / 256;
>               break;
>       case POWER_SUPPLY_PROP_CHARGE_COUNTER:
>               ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&ec_word, 2);
> -- 
> 2.19.1
> 

Attachment: signature.asc
Description: PGP signature

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to