Skip to content

Commit 2c42331

Browse files
jwrdegoedegregkh
authored andcommitted
HID: sensor-hub: Restore fixup for Lenovo ThinkPad Helix 2 sensor hub report
[ Upstream commit ade573e ] Commit b0f847e ("HID: hid-sensor-hub: Force logical minimum to 1 for power and report state") not only replaced the descriptor fixup done for devices with the HID_SENSOR_HUB_ENUM_QUIRK with a generic fix, but also accidentally removed the unrelated descriptor fixup for the Lenovo ThinkPad Helix 2 sensor hub. This commit restores this fixup. Restoring this fixup not only fixes the Lenovo ThinkPad Helix 2's sensors, but also the Lenovo ThinkPad 8's sensors. Fixes: b0f847e ("HID: hid-sensor-hub: Force logical minimum ...") Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: Fernando D S Lima <fernandodsl@gmail.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d4da712 commit 2c42331

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

drivers/hid/hid-sensor-hub.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,28 @@ void sensor_hub_device_close(struct hid_sensor_hub_device *hsdev)
579579
}
580580
EXPORT_SYMBOL_GPL(sensor_hub_device_close);
581581

582+
static __u8 *sensor_hub_report_fixup(struct hid_device *hdev, __u8 *rdesc,
583+
unsigned int *rsize)
584+
{
585+
/*
586+
* Checks if the report descriptor of Thinkpad Helix 2 has a logical
587+
* minimum for magnetic flux axis greater than the maximum.
588+
*/
589+
if (hdev->product == USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA &&
590+
*rsize == 2558 && rdesc[913] == 0x17 && rdesc[914] == 0x40 &&
591+
rdesc[915] == 0x81 && rdesc[916] == 0x08 &&
592+
rdesc[917] == 0x00 && rdesc[918] == 0x27 &&
593+
rdesc[921] == 0x07 && rdesc[922] == 0x00) {
594+
/* Sets negative logical minimum for mag x, y and z */
595+
rdesc[914] = rdesc[935] = rdesc[956] = 0xc0;
596+
rdesc[915] = rdesc[936] = rdesc[957] = 0x7e;
597+
rdesc[916] = rdesc[937] = rdesc[958] = 0xf7;
598+
rdesc[917] = rdesc[938] = rdesc[959] = 0xff;
599+
}
600+
601+
return rdesc;
602+
}
603+
582604
static int sensor_hub_probe(struct hid_device *hdev,
583605
const struct hid_device_id *id)
584606
{
@@ -742,6 +764,7 @@ static struct hid_driver sensor_hub_driver = {
742764
.probe = sensor_hub_probe,
743765
.remove = sensor_hub_remove,
744766
.raw_event = sensor_hub_raw_event,
767+
.report_fixup = sensor_hub_report_fixup,
745768
#ifdef CONFIG_PM
746769
.suspend = sensor_hub_suspend,
747770
.resume = sensor_hub_resume,

0 commit comments

Comments
 (0)