]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: steelseries: Fix STEELSERIES_SRWS1 handling in steelseries_remove()
authorJiri Kosina <jkosina@suse.com>
Fri, 12 Sep 2025 14:27:35 +0000 (16:27 +0200)
committerJiri Kosina <jkosina@suse.com>
Fri, 12 Sep 2025 14:27:35 +0000 (16:27 +0200)
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>
drivers/hid/hid-steelseries.c

index 8af98d67959e0a87e514df7b5b9df680c7a14e61..f98435631aa180daa4d2ab5c5c24a75ad789945f 100644 (file)
@@ -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);
 }