openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

HID: elan: Add a flag for selecting if the touchpad has a LED 

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>
This commit is contained in:
Hans de Goede 2018-07-11 12:38:35 +02:00 committed by Jiri Kosina
parent 19588bee0e
commit 7ed3f281d8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hid/hid-elan.c
View File

@ -36,6 +36,8 @@
#define ELAN_MUTE_LED_REPORT 0xBC #define ELAN_MUTE_LED_REPORT 0xBC
#define ELAN_LED_REPORT_SIZE 8 #define ELAN_LED_REPORT_SIZE 8
#define ELAN_HAS_LED BIT(0)
struct elan_drvdata { struct elan_drvdata {
struct input_dev *input; struct input_dev *input;
u8 prev_report[ELAN_INPUT_REPORT_SIZE]; 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) if (ret)
goto err; goto err;
if (id->driver_data & ELAN_HAS_LED) {
ret = elan_init_mute_led(hdev); ret = elan_init_mute_led(hdev);
if (ret) if (ret)
goto err; goto err;
}
return 0; return 0;
err: err:
@ -466,7 +470,8 @@ static void elan_remove(struct hid_device *hdev)
} }
static const struct hid_device_id elan_devices[] = { 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); MODULE_DEVICE_TABLE(hid, elan_devices);