diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-06 15:40:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-06 15:40:14 -0800 |
| commit | 3a157bdfc8d23c3fbfbeea47ff721fe9ef254b25 (patch) | |
| tree | e8526cedf89dca98f4c114e34992bb0a0fa0b5dd /drivers | |
| parent | Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge branches 'acpi-cppc' and 'acpi-docs' (diff) | |
| download | linux-3a157bdfc8d23c3fbfbeea47ff721fe9ef254b25.tar.gz linux-3a157bdfc8d23c3fbfbeea47ff721fe9ef254b25.zip | |
Merge tag 'acpi-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These fix a coding mistake in the ACPI Smart Battery Subsystem (SBS)
driver and two documentation issues:
- Fix computation of the battery->present value in acpi_battery_read()
to work when battery->id is not zero (Dan Carpenter)
- Fix comment typo in the ACPI CPPC library (Chu Guangqing)
- Fix I2C device references in two ASL examples in the firmware guide
that were broken by a previous update (Jonas Gorski)"
* tag 'acpi-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: SBS: Fix present test in acpi_battery_read()
ACPI: CPPC: Fix typo in a comment
Documentation: ACPI: i2c-muxes: fix I2C device references
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/cppc_acpi.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/sbs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index ab4651205e8a..6c684e54fe01 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -750,7 +750,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) } /* - * Disregard _CPC if the number of entries in the return pachage is not + * Disregard _CPC if the number of entries in the return package is not * as expected, but support future revisions being proper supersets of * the v3 and only causing more entries to be returned by _CPC. */ diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index a3f95a3fffde..d3edc3bcbf01 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -487,7 +487,7 @@ static int acpi_battery_read(struct acpi_battery *battery) if (result) return result; - battery->present = state & (1 << battery->id); + battery->present = !!(state & (1 << battery->id)); if (!battery->present) return 0; |