summaryrefslogtreecommitdiff
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2025-11-19 17:26:25 +0300
committerThomas Zimmermann <tzimmermann@suse.de>2025-11-19 17:26:25 +0300
commitd4f14fa5c6c4d39b5187e1f410d59e38d76f283f (patch)
tree8666bd4fcd78149936221a64707c4dc6ca75a9f8 /drivers/acpi/button.c
parent949f1fd2225baefbea2995afa807dba5cbdb6bd3 (diff)
parent6a23ae0a96a600d1d12557add110e0bb6e32730c (diff)
downloadlinux-d4f14fa5c6c4d39b5187e1f410d59e38d76f283f.tar.xz
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get fixes from v6.18-rc6. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/acpi/button.c')
-rw-r--r--drivers/acpi/button.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 0a7026040188..3c6dd9b4ba0a 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -619,8 +619,10 @@ static int acpi_button_add(struct acpi_device *device)
input_set_drvdata(input, device);
error = input_register_device(input);
- if (error)
+ if (error) {
+ input_free_device(input);
goto err_remove_fs;
+ }
switch (device->device_type) {
case ACPI_BUS_TYPE_POWER_BUTTON: