diff options
author | Bastien Nocera <hadess@hadess.net> | 2017-03-27 10:59:22 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-04-06 08:36:36 -0400 |
commit | 3861e6ca305c5262f0493e9141f0c52ba066a447 (patch) | |
tree | b16f1ae9961ecefb50de2d00447d2e6cbbbe171a | |
parent | 8dba3026d5453aa6de00f8726fdcde45d5c57484 (diff) |
HID: logitech-hidpp: Add scope to battery
Without a scope defined, UPower assumes that the battery provides
power to the computer it's connected to, like a laptop battery or a UPS.
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 4eeb550617bf..4aaf2378897f 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c | |||
@@ -761,6 +761,7 @@ static int hidpp20_battery_event(struct hidpp_device *hidpp, | |||
761 | static enum power_supply_property hidpp_battery_props[] = { | 761 | static enum power_supply_property hidpp_battery_props[] = { |
762 | POWER_SUPPLY_PROP_STATUS, | 762 | POWER_SUPPLY_PROP_STATUS, |
763 | POWER_SUPPLY_PROP_CAPACITY, | 763 | POWER_SUPPLY_PROP_CAPACITY, |
764 | POWER_SUPPLY_PROP_SCOPE, | ||
764 | }; | 765 | }; |
765 | 766 | ||
766 | static int hidpp_battery_get_property(struct power_supply *psy, | 767 | static int hidpp_battery_get_property(struct power_supply *psy, |
@@ -777,6 +778,9 @@ static int hidpp_battery_get_property(struct power_supply *psy, | |||
777 | case POWER_SUPPLY_PROP_CAPACITY: | 778 | case POWER_SUPPLY_PROP_CAPACITY: |
778 | val->intval = hidpp->battery.level; | 779 | val->intval = hidpp->battery.level; |
779 | break; | 780 | break; |
781 | case POWER_SUPPLY_PROP_SCOPE: | ||
782 | val->intval = POWER_SUPPLY_SCOPE_DEVICE; | ||
783 | break; | ||
780 | default: | 784 | default: |
781 | ret = -EINVAL; | 785 | ret = -EINVAL; |
782 | break; | 786 | break; |