diff mbox

[resend,7/8] HID: elan: Add a flag for selecting if the touchpad has a LED

Message ID 20180601130555.25625-8-hdegoede@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans de Goede June 1, 2018, 1:05 p.m. UTC 
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>
---
 drivers/hid/hid-elan.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c
index 4791c22a3d37..edfd4788c54c 100644
--- a/drivers/hid/hid-elan.c
+++ b/drivers/hid/hid-elan.c
@@ -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];
@@ -455,9 +457,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:
@@ -471,7 +475,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);