Re: [PATCH] Input: wacom - Export battery scope

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Sun, Oct 13, 2013 at 09:49:22PM +0200, Bastien Nocera wrote:
> 
> This will stop UPower from detecting the tablet as a power supply,
> and using its battery status to hibernate or switch off the machine.
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=70321
> 
> Signed-off-by: Bastien Nocera <hadess@hadess.net>


Applied, thank you.

> ---
>  drivers/input/tablet/wacom_sys.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> index 79b69ea..e53416a 100644
> --- a/drivers/input/tablet/wacom_sys.c
> +++ b/drivers/input/tablet/wacom_sys.c
> @@ -1031,6 +1031,7 @@ static void wacom_destroy_leds(struct wacom *wacom)
>  }
>  
>  static enum power_supply_property wacom_battery_props[] = {
> +	POWER_SUPPLY_PROP_SCOPE,
>  	POWER_SUPPLY_PROP_CAPACITY
>  };
>  
> @@ -1042,6 +1043,9 @@ static int wacom_battery_get_property(struct power_supply *psy,
>  	int ret = 0;
>  
>  	switch (psp) {
> +		case POWER_SUPPLY_PROP_SCOPE:
> +			val->intval = POWER_SUPPLY_SCOPE_DEVICE;
> +			break;
>  		case POWER_SUPPLY_PROP_CAPACITY:
>  			val->intval =
>  				wacom->wacom_wac.battery_capacity * 100 / 31;
> -- 
> 1.8.3.1
> 
> 

-- 
Dmitry