tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HID: pidff: Make sure to fetch pool before checking SIMULTANEOUS_MAX

Browse Source 
[ Upstream commit 1f650dcec32d22deb1d6db12300a2b98483099a9 ]

As noted by Anssi some 20 years ago, pool report is sometimes messed up.
This worked fine on many devices but casued oops on VRS DirectForce PRO.

Here, we're making sure pool report is refetched before trying to access
any of it's fields. While loop was replaced with a for loop + exit
conditions were moved aroud to decrease the possibility of creating an
infinite loop scenario.

Signed-off-by: Tomasz Pakuła <tomasz.pakula.oficjalny@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tomasz Pakuła
2025-02-11 15:35:08 +01:00
committed by Greg Kroah-Hartman
parent 13d15dd617
commit 2118618697
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/hid/usbhid/hid-pidff.c
View File

@@ -604,28 +604,25 @@ static void pidff_reset(struct pidff_device *pidff)
}
/*
* Refetch pool report
* Fetch pool report
*/
static void pidff_fetch_pool(struct pidff_device *pidff)
{
if (!pidff->pool[PID_SIMULTANEOUS_MAX].value)
return;
int i;
struct hid_device *hid = pidff->hid;
int i = 0;
while (pidff->pool[PID_SIMULTANEOUS_MAX].value[0] < 2) {
hid_dbg(pidff->hid, "pid_pool requested again\n");
hid_hw_request(pidff->hid, pidff->reports[PID_POOL],
HID_REQ_GET_REPORT);
hid_hw_wait(pidff->hid);
/* Repeat if PID_SIMULTANEOUS_MAX < 2 to make sure it's correct */
for(i = 0; i < 20; i++) {
hid_hw_request(hid, pidff->reports[PID_POOL], HID_REQ_GET_REPORT);
hid_hw_wait(hid);
/* break after 20 tries with SIMULTANEOUS_MAX < 2 */
if (i++ > 20) {
hid_warn(pidff->hid,
"device reports %d simultaneous effects\n",
pidff->pool[PID_SIMULTANEOUS_MAX].value[0]);
break;
}
if (!pidff->pool[PID_SIMULTANEOUS_MAX].value)
return;
if (pidff->pool[PID_SIMULTANEOUS_MAX].value[0] >= 2)
return;
}
hid_warn(hid, "device reports %d simultaneous effects\n",
pidff->pool[PID_SIMULTANEOUS_MAX].value[0]);
}
/*