Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c423318 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

HID: sensor-hub: Restore fixup for Lenovo ThinkPad Helix 2 sensor hub report 



[ Upstream commit ade573eb1e03d1ee5abcb3359b1259469ab6e8ed ]

Commit b0f847e1 ("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: b0f847e1 ("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: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4da7122

drivers/hid/hid-sensor-hub.c

+23 −0
Original line number Diff line number Diff line
@@ -579,6 +579,28 @@ void sensor_hub_device_close(struct hid_sensor_hub_device *hsdev) 
}

EXPORT_SYMBOL_GPL(sensor_hub_device_close);



static __u8 *sensor_hub_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	/*

	 * Checks if the report descriptor of Thinkpad Helix 2 has a logical

	 * minimum for magnetic flux axis greater than the maximum.

	 */

	if (hdev->product == USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA &&

		*rsize == 2558 && rdesc[913] == 0x17 && rdesc[914] == 0x40 &&

		rdesc[915] == 0x81 && rdesc[916] == 0x08 &&

		rdesc[917] == 0x00 && rdesc[918] == 0x27 &&

		rdesc[921] == 0x07 && rdesc[922] == 0x00) {

		/* Sets negative logical minimum for mag x, y and z */

		rdesc[914] = rdesc[935] = rdesc[956] = 0xc0;

		rdesc[915] = rdesc[936] = rdesc[957] = 0x7e;

		rdesc[916] = rdesc[937] = rdesc[958] = 0xf7;

		rdesc[917] = rdesc[938] = rdesc[959] = 0xff;

	}



	return rdesc;

}



static int sensor_hub_probe(struct hid_device *hdev,

				const struct hid_device_id *id)

{
@@ -742,6 +764,7 @@ static struct hid_driver sensor_hub_driver = { 
	.probe = sensor_hub_probe,

	.remove = sensor_hub_remove,

	.raw_event = sensor_hub_raw_event,

	.report_fixup = sensor_hub_report_fixup,

#ifdef CONFIG_PM

	.suspend = sensor_hub_suspend,

	.resume = sensor_hub_resume,