[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250716172221.1360886-1-aha310510@gmail.com>
Date: Thu, 17 Jul 2025 02:22:21 +0900
From: Jeongjun Park <aha310510@...il.com>
To: jikos@...nel.org,
bentiss@...nel.org
Cc: andrew.smirnov@...il.com,
juha.kuikka@...il.com,
linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org,
Jeongjun Park <aha310510@...il.com>
Subject: [PATCH] HID: microsoft: add a call hid_hw_stop() in probe()
If hid_hw_start() succeeds but ms_init_ff() fails, it will return without
calling hid_hw_stop(), which will cause a memory leak. So to prevent this,
we need to change probe() to call hid_hw_stop().
Fixes: 73c5b254c365 ("HID: microsoft: Add rumble support for Xbox One S controller")
Signed-off-by: Jeongjun Park <aha310510@...il.com>
---
drivers/hid/hid-microsoft.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
index 18ac21c0bcb2..a27ea59a1bef 100644
--- a/drivers/hid/hid-microsoft.c
+++ b/drivers/hid/hid-microsoft.c
@@ -385,22 +385,26 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id)
ret = hid_parse(hdev);
if (ret) {
hid_err(hdev, "parse failed\n");
- goto err_free;
+ return ret;
}
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | ((quirks & MS_HIDINPUT) ?
HID_CONNECT_HIDINPUT_FORCE : 0));
if (ret) {
hid_err(hdev, "hw start failed\n");
- goto err_free;
+ return ret;
}
ret = ms_init_ff(hdev);
- if (ret)
+ if (ret) {
hid_err(hdev, "could not initialize ff, continuing anyway");
+ goto err_hw_stop;
+ }
return 0;
-err_free:
+
+err_hw_stop:
+ hid_hw_stop(hdev);
return ret;
}
--
Powered by blists - more mailing lists