Skip to content

Commit 3a157bd

Browse files
committed
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
2 parents a1388fc + 771e8f4 commit 3a157bd

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

Documentation/firmware-guide/acpi/i2c-muxes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
41-
ResourceConsumer,,)
40+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",
41+
0x00, ResourceConsumer,,)
4242
}
4343
}
4444
}
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
56-
ResourceConsumer,,)
55+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",
56+
0x00, ResourceConsumer,,)
5757
}
5858
}
5959
}

drivers/acpi/cppc_acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
750750
}
751751

752752
/*
753-
* Disregard _CPC if the number of entries in the return pachage is not
753+
* Disregard _CPC if the number of entries in the return package is not
754754
* as expected, but support future revisions being proper supersets of
755755
* the v3 and only causing more entries to be returned by _CPC.
756756
*/

drivers/acpi/sbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ static int acpi_battery_read(struct acpi_battery *battery)
487487
if (result)
488488
return result;
489489

490-
battery->present = state & (1 << battery->id);
490+
battery->present = !!(state & (1 << battery->id));
491491
if (!battery->present)
492492
return 0;
493493

0 commit comments

Comments
 (0)