github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-27 11:02:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

HID: alps: unregister DualPoint Stick input device on remove

Browse Source 
alps_input_configured() allocates a second input device ("DualPoint
Stick") with input_allocate_device() and registers it, but the
alps_driver struct has no .remove handler and input2 is not tracked in
hdev->inputs.  The default remove path (hid_hw_stop -> hidinput_disconnect)
only iterates hdev->inputs, so input2 is never unregistered and leaks
on every device removal.

Add a .remove handler that stops the device first (preventing URB
callbacks from touching input2 during teardown) and then unregisters
input2.

Fixes: 2562756dde ("HID: add Alps I2C HID Touchpad-Stick support")
Cc: stable@vger.kernel.org
Signed-off-by: Chen Changcheng <chenchangcheng@kylinos.cn>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
Chen Changcheng 2026-08-14 15:06:20 +08:00 committed by Jiri Kosina
parent a1a5ad37e5
commit aa9dde93e0
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/hid/hid-alps.c
View File

@ -823,6 +823,24 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
return 0; return 0;
} }
static void alps_remove(struct hid_device *hdev)
{
struct alps_dev *data = hid_get_drvdata(hdev);
/*
* input2 ("DualPoint Stick") is allocated separately and is not
* tracked in hdev->inputs, so the default remove path
* (hid_hw_stop -> hidinput_disconnect) does not unregister it.
*
* Stop the device first so that no URB callback can touch input2
* while it is being unregistered, then drop it explicitly.
*/
hid_hw_stop(hdev);
if (data->input2)
input_unregister_device(data->input2);
}
static const struct hid_device_id alps_id[] = { static const struct hid_device_id alps_id[] = {
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) }, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
@ -845,6 +863,7 @@ static struct hid_driver alps_driver = {
.input_configured = alps_input_configured, .input_configured = alps_input_configured,
.resume = pm_ptr(alps_post_resume), .resume = pm_ptr(alps_post_resume),
.reset_resume = pm_ptr(alps_post_reset), .reset_resume = pm_ptr(alps_post_reset),
.remove = alps_remove,
}; };
module_hid_driver(alps_driver); module_hid_driver(alps_driver);