diff options
| author | Ross Skaliotis <rskaliotis@gmail.com> | 2014-12-20 19:01:35 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-23 15:17:50 +0000 |
| commit | e4d8e5bd3d1ab7ff259e17c13c79baef414f2d95 (patch) | |
| tree | db91d085d0f0e1a82f19a3e38ecb038cf75f3a7a /drivers/hid | |
| parent | 3d987cb2d14c86d610757a60bc1737e25e997575 (diff) | |
| download | linux-stable-e4d8e5bd3d1ab7ff259e17c13c79baef414f2d95.tar.gz linux-stable-e4d8e5bd3d1ab7ff259e17c13c79baef414f2d95.tar.bz2 linux-stable-e4d8e5bd3d1ab7ff259e17c13c79baef414f2d95.zip | |
HID: apple: fix battery support for the 2009 ANSI wireless keyboard
commit cbd366bea2b8513bc0fc1c9e8832cb0ab221d6d5 upstream.
Enabled quirks necessary for correct battery capacity reporting. Cleaned up
surrounding style.
Signed-off-by: Ross Skaliotis <rskaliotis@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 79fa1cd9dfdd..197128ed8225 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -306,10 +306,13 @@ static enum power_supply_property hidinput_battery_props[] = { static const struct hid_device_id hid_battery_quirks[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, - USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), - HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), + HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), + HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, - USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI), + USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI), HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO), |