summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2011-12-03 04:06:10 +0100
committerJeremy Fitzhardinge <jeremy@goop.org>2012-01-08 08:30:39 +0100
commitb3ca3839f344aa469e6f53c8bbb633e5ab9b96c8 (patch)
treeecc3918a7042e8c87de6490014787216df955820 /drivers/hid
parenthid-input/battery: make the battery setup common for INPUTs and FEATUREs (diff)
downloadlinux-b3ca3839f344aa469e6f53c8bbb633e5ab9b96c8.tar.xz
linux-b3ca3839f344aa469e6f53c8bbb633e5ab9b96c8.zip
hid-input/battery: power-supply type really *is* a battery
It just isn't a battery which is powering the computer. upower needs a more nuanced understanding of this. Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 771ff5df5742..ceade58b8027 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -368,7 +368,7 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
if (battery->name == NULL)
goto out;
- battery->type = POWER_SUPPLY_TYPE_USB;
+ battery->type = POWER_SUPPLY_TYPE_BATTERY;
battery->properties = hidinput_battery_props;
battery->num_properties = ARRAY_SIZE(hidinput_battery_props);
battery->use_for_apm = 0;