Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...

[cascardo/linux.git] / drivers / hid / hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index f4eeb6b..bcfaf32 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -303,6 +303,7 @@ static enum power_supply_property hidinput_battery_props[] = {
 
 #define HID_BATTERY_QUIRK_PERCENT      (1 << 0) /* always reports percent */
 #define HID_BATTERY_QUIRK_FEATURE      (1 << 1) /* ask for feature report */
+#define HID_BATTERY_QUIRK_IGNORE       (1 << 2) /* completely ignore the battery */
 
 static const struct hid_device_id hid_battery_quirks[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
@@ -320,6 +321,9 @@ static const struct hid_device_id hid_battery_quirks[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
                USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
          HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM,
+               USB_DEVICE_ID_ELECOM_BM084),
+         HID_BATTERY_QUIRK_IGNORE },
        {}
 };
 
@@ -408,6 +412,14 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
        if (dev->battery != NULL)
                goto out;       /* already initialized? */
 
+       quirks = find_battery_quirk(dev);
+
+       hid_dbg(dev, "device %x:%x:%x %d quirks %d\n",
+               dev->bus, dev->vendor, dev->product, dev->version, quirks);
+
+       if (quirks & HID_BATTERY_QUIRK_IGNORE)
+               goto out;
+
        psy_desc = kzalloc(sizeof(*psy_desc), GFP_KERNEL);
        if (psy_desc == NULL)
                goto out;
@@ -424,11 +436,6 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
        psy_desc->use_for_apm = 0;
        psy_desc->get_property = hidinput_get_battery_property;
 
-       quirks = find_battery_quirk(dev);
-
-       hid_dbg(dev, "device %x:%x:%x %d quirks %d\n",
-               dev->bus, dev->vendor, dev->product, dev->version, quirks);
-
        min = field->logical_minimum;
        max = field->logical_maximum;