Re: [PATCH 04/14] POWER: bq27x00: Return -ENODEV for properties ifthe battery is not present

[Rodolfo Giometti]

On Sun, Feb 06, 2011 at 01:48:01AM +0100, Lars-Peter Clausen wrote:
> This patch changes get_property callback of the bq27x00 battery to return
> -ENODEV for properties other then the PROP_PRESENT if the battery is not
> present.
> The power subsystem core expects a driver to behave that way.
> 
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
> ---
>  drivers/power/bq27x00_battery.c |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
> index 1b06134..9f16666 100644
> --- a/drivers/power/bq27x00_battery.c
> +++ b/drivers/power/bq27x00_battery.c
> @@ -252,16 +252,21 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
>  {
>  	int ret = 0;
>  	struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
> +	int voltage = bq27x00_battery_voltage(di);
> +
> +	if (psp != POWER_SUPPLY_PROP_PRESENT && voltage <= 0)
> +		return -ENODEV;
>  
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_STATUS:
>  		ret = bq27x00_battery_status(di, val);
>  		break;
>  	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
> +		val->intval = voltage;
> +		break;
>  	case POWER_SUPPLY_PROP_PRESENT:
> -		val->intval = bq27x00_battery_voltage(di);
>  		if (psp == POWER_SUPPLY_PROP_PRESENT)
> -			val->intval = val->intval <= 0 ? 0 : 1;
> +			val->intval = voltage <= 0 ? 0 : 1;
>  		break;
>  	case POWER_SUPPLY_PROP_CURRENT_NOW:
>  		val->intval = bq27x00_battery_current(di);
> -- 
> 1.7.2.3
> 

Acked-by: Rodolfo Giometti <giometti@xxxxxxxx>

-- 

GNU/Linux Solutions                  e-mail: giometti@xxxxxxxxxxxx
Linux Device Driver                          giometti@xxxxxxxx
Embedded Systems                     phone:  +39 349 2432127
UNIX programming                     skype:  rodolfo.giometti
Freelance ICT Italia - Consulente ICT Italia - www.consulenti-ict.it
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/