diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-09-12 16:27:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-15 12:03:56 +0200 |
| commit | 69a5d59e97fb8de41c245c8d5448b39b76e3d002 (patch) | |
| tree | 224c121862a113769b72e7756dffa9795aa98dd4 /drivers/hid | |
| parent | ffaf14cd802bdb022e4037fb012a458f83a62268 (diff) | |
| download | linux-69a5d59e97fb8de41c245c8d5448b39b76e3d002.tar.gz linux-69a5d59e97fb8de41c245c8d5448b39b76e3d002.tar.bz2 linux-69a5d59e97fb8de41c245c8d5448b39b76e3d002.zip | |
HID: steelseries: Fix STEELSERIES_SRWS1 handling in steelseries_remove()
[ Upstream commit 2910913ef87dd9b9ce39e844c7295e1896b3b039 ]
srws1_remove label can be only reached only if LEDS subsystem is enabled. To
avoid putting horryfing ifdef second time around the label, just perform
the cleanup and exit immediately directly.
Fixes: a84eeacbf9325 ("HID: steelseries: refactor probe() and remove()")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202509090334.76D4qGtW-lkp@intel.com/
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-steelseries.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c index 8af98d67959e..f98435631aa1 100644 --- a/drivers/hid/hid-steelseries.c +++ b/drivers/hid/hid-steelseries.c @@ -582,7 +582,7 @@ static void steelseries_remove(struct hid_device *hdev) if (hdev->product == USB_DEVICE_ID_STEELSERIES_SRWS1) { #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES)) - goto srws1_remove; + hid_hw_stop(hdev); #endif return; } @@ -596,7 +596,6 @@ static void steelseries_remove(struct hid_device *hdev) cancel_delayed_work_sync(&sd->battery_work); hid_hw_close(hdev); -srws1_remove: hid_hw_stop(hdev); } |