diff options
| author |   Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2019-01-30 13:32:17 -0800 |
|---|---|---|
| committer |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-02-01 09:26:41 +0100 |
| commit | 1578461a18596cf33093b392d1b7853ba4276154 (patch) | |
| tree | 24c31bd0e8cfcec6d315dd4cdfcd08b956629885 /drivers/hid | |
| parent | HID: intel-ish-hid: Switch to use new generic UUID API (diff) | |
| download | linux-dev-1578461a18596cf33093b392d1b7853ba4276154.tar.xz linux-dev-1578461a18596cf33093b392d1b7853ba4276154.zip | |
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 <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp-hid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c index e918d78e541c..bc4c536f3c0d 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid.c +++ b/drivers/hid/intel-ish-hid/ishtp-hid.c @@ -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); |