Commit 3a157bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a1388fcb 771e8f48

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

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

	 */

drivers/acpi/sbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;