]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI: battery: Check for error code from devm_mutex_init() call
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 16 Oct 2025 13:34:37 +0000 (09:34 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 19 Oct 2025 14:34:03 +0000 (16:34 +0200)
[ Upstream commit 815daedc318b2f9f1b956d0631377619a0d69d96 ]

Even if it's not critical, the avoidance of checking the error code
from devm_mutex_init() call today diminishes the point of using devm
variant of it. Tomorrow it may even leak something. Add the missed
check.

Fixes: 0710c1ce5045 ("ACPI: battery: initialize mutexes through devm_ APIs")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20241030162754.2110946-1-andriy.shevchenko@linux.intel.com
[ rjw: Added 2 empty code lines ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 399dbcadc01e ("ACPI: battery: Add synchronization between interface updates")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/acpi/battery.c

index 1a10eeddedac1e49e81cfa9e6a12f39dbb49abe1..8d3e44f0caf44b88cede502413fc7e81d3321270 100644 (file)
@@ -1225,8 +1225,14 @@ static int acpi_battery_add(struct acpi_device *device)
        strscpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
        strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
        device->driver_data = battery;
-       devm_mutex_init(&device->dev, &battery->lock);
-       devm_mutex_init(&device->dev, &battery->sysfs_lock);
+       result = devm_mutex_init(&device->dev, &battery->lock);
+       if (result)
+               return result;
+
+       result = devm_mutex_init(&device->dev, &battery->sysfs_lock);
+       if (result)
+               return result;
+
        if (acpi_has_method(battery->device->handle, "_BIX"))
                set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);