Skip to content

Commit 927002e

Browse files
committed
Merge tag 'acpi-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Address recent regression causing battery devices to be never bound to a driver on some systems (Hans de Goede)" * tag 'acpi-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: scan: Fix battery devices sometimes never binding
2 parents 4cb2c00 + 0f347aa commit 927002e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/acpi/scan.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,12 +2123,12 @@ void acpi_walk_dep_device_list(acpi_handle handle)
21232123
list_for_each_entry_safe(dep, tmp, &acpi_dep_list, node) {
21242124
if (dep->supplier == handle) {
21252125
acpi_bus_get_device(dep->consumer, &adev);
2126-
if (!adev)
2127-
continue;
21282126

2129-
adev->dep_unmet--;
2130-
if (!adev->dep_unmet)
2131-
acpi_bus_attach(adev, true);
2127+
if (adev) {
2128+
adev->dep_unmet--;
2129+
if (!adev->dep_unmet)
2130+
acpi_bus_attach(adev, true);
2131+
}
21322132

21332133
list_del(&dep->node);
21342134
kfree(dep);

0 commit comments

Comments
 (0)