Skip to content

Commit 1578461

Browse files
spandruvadabentiss
authored andcommitted
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. Signed-off-by: Srinivas Pandruvada <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent 1410650 commit 1578461

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/hid/intel-ish-hid/ishtp-hid.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
206206
hid->bus = BUS_INTEL_ISHTP;
207207
hid->dev.parent = &client_data->cl_device->dev;
208208
hid->version = le16_to_cpu(ISH_HID_VERSION);
209-
hid->vendor = le16_to_cpu(ISH_HID_VENDOR);
210-
hid->product = le16_to_cpu(ISH_HID_PRODUCT);
209+
hid->vendor = le16_to_cpu(client_data->hid_devices[cur_hid_dev].vid);
210+
hid->product = le16_to_cpu(client_data->hid_devices[cur_hid_dev].pid);
211211
snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", "hid-ishtp",
212212
hid->vendor, hid->product);
213213

0 commit comments

Comments
 (0)