HID: intel-ish-hid: Use VID/PID from ISH
Subsystems (2)
Srinivas Pandruvada
maintainerPATCH 1/1 HID: intel-ish-hid: Use VID/PID from ISH
The Intel ISH HID can now have other devices attached to it, not just sensors. Hence ISH HID transport is no longer just used for sensors. Currently the vendor and product id is hardcoded for sensors, but they can be obtained from ISH firmware for the real device. The driver already extract them and store as part of device_info structure in client_data. So use vendor id/product id obtained from the ISH firmware.
--- drivers/hid/intel-ish-hid/ishtp-hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/intel-ish-hid/ishtp-hid.c +2 -2
@@ -206,8 +206,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, hid->bus =BUS_INTEL_ISHTP ; hid->dev.parent = &client_data->cl_device->dev; hid->version =le16_to_cpu (ISH_HID_VERSION ); - hid->vendor =le16_to_cpu (ISH_HID_VENDOR ); - hid->product =le16_to_cpu (ISH_HID_PRODUCT ); + hid->vendor =le16_to_cpu (client_data->hid_devices[cur_hid_dev].vid); + hid->product =le16_to_cpu (client_data->hid_devices[cur_hid_dev].pid);snprintf (hid->name,sizeof (hid->name),"%s %04X:%04X" ,"hid-ishtp" , hid->vendor, hid->product);
Signature · 1 line
2.17.2
Benjamin Tissoires
AppliedQuoted 10 lines · Srinivas Pandruvada
The Intel ISH HID can now have other devices attached to it, not just sensors. Hence ISH HID transport is no longer just used for sensors. Currently the vendor and product id is hardcoded for sensors, but they can be obtained from ISH firmware for the real device. The driver already extract them and store as part of
device_infostructure inclient_data. So use vendor id/product id obtained from the ISH firmware.Signed-off-by Srinivas Pandruvada <[email protected]>---
Applied to for-5.1/ish
Cheers,
Benjamin
Quoted 21 lines
drivers/hid/intel-ish-hid/ishtp-hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/hid/intel-ish-hid/ishtp-hid.c +2
-3@@ -206,8 +206,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, hid->bus =BUS_INTEL_ISHTP ; hid->dev.parent = &client_data->cl_device->dev; hid->version =le16_to_cpu (ISH_HID_VERSION ); - hid->vendor =le16_to_cpu (ISH_HID_VENDOR ); - hid->product =le16_to_cpu (ISH_HID_PRODUCT ); + hid->vendor =le16_to_cpu (client_data->hid_devices[cur_hid_dev].vid); + hid->product =le16_to_cpu (client_data->hid_devices[cur_hid_dev].pid);snprintf (hid->name,sizeof (hid->name),"%s %04X:%04X" ,"hid-ishtp" , hid->vendor, hid->product); --2.17.2