diff options
| author | Linus Torvalds | 2024-04-11 12:03:43 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2024-04-11 12:03:43 -0700 |
| commit | 00dcf5d862e86e57f5ce46344039f11bb1ad61f6 (patch) | |
| tree | 615fb70913590c84943d7c46f1b773fb1f6ad5c8 /drivers | |
| parent | 136eb5fd6a5d4e87f5c64a721b48b8a5da5351f3 (diff) | |
| parent | d7da7e7cec9868b24f0e39298156caf0277e82c7 (diff) | |
Merge tag 'acpi-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These fix the handling of dependencies between devices in the ACPI
device enumeration code and address a _UID matching regression from
the 6.8 development cycle.
Specifics:
- Modify the ACPI device enumeration code to avoid counting
dependencies that have been met already as unmet (Hans de Goede)
- Make _UID matching take the integer value of 0 into account as
appropriate (Raag Jadav)"
* tag 'acpi-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: bus: allow _UID matching for integer zero
ACPI: scan: Do not increase dep_unmet for already met dependencies
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 7c157bf92695..d1464324de95 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1843,7 +1843,8 @@ static void acpi_scan_dep_init(struct acpi_device *adev) if (dep->honor_dep) adev->flags.honor_deps = 1; - adev->dep_unmet++; + if (!dep->met) + adev->dep_unmet++; } } } |