HID: elan: Add a flag for selecting if the touchpad has a LED
authorHans de Goede <hdegoede@redhat.com>
Wed, 11 Jul 2018 10:38:35 +0000 (12:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 Jul 2018 13:25:40 +0000 (15:25 +0200)
Note all Elan touchpads have a LED make this configurable using
a flag in hi_id.driver_data.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-elan.c

index 6969fb5344a58c76565c2e4e06b48c3b9649c1be..ae1e24061c0a9f6f6978fd2cf52b17a7d7ad63af 100644 (file)
@@ -36,6 +36,8 @@
 #define ELAN_MUTE_LED_REPORT   0xBC
 #define ELAN_LED_REPORT_SIZE   8
 
+#define ELAN_HAS_LED           BIT(0)
+
 struct elan_drvdata {
        struct input_dev *input;
        u8 prev_report[ELAN_INPUT_REPORT_SIZE];
@@ -450,9 +452,11 @@ static int elan_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (ret)
                goto err;
 
-       ret = elan_init_mute_led(hdev);
-       if (ret)
-               goto err;
+       if (id->driver_data & ELAN_HAS_LED) {
+               ret = elan_init_mute_led(hdev);
+               if (ret)
+                       goto err;
+       }
 
        return 0;
 err:
@@ -466,7 +470,8 @@ static void elan_remove(struct hid_device *hdev)
 }
 
 static const struct hid_device_id elan_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_HP_X2_10_COVER) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_HP_X2_10_COVER),
+         .driver_data = ELAN_HAS_LED },
        { }
 };
 MODULE_DEVICE_TABLE(hid, elan_devices);