Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (0746c4a9) · Commits · 戴 / test

Pull i2c fix from Wolfram Sang: "Regression fix for rc1 and stable kernels as well" * 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs

drivers/i2c/i2c-core-acpi.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -264,6 +264,7 @@ static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
		void i2c_acpi_register_devices(struct i2c_adapter *adap)
		{
		acpi_status status;
		acpi_handle handle;

		if (!has_acpi_companion(&adap->dev))
		return;
		@@ -274,6 +275,15 @@ void i2c_acpi_register_devices(struct i2c_adapter *adap)
		adap, NULL);
		if (ACPI_FAILURE(status))
		dev_warn(&adap->dev, "failed to enumerate I2C slaves\n");

		if (!adap->dev.parent)
		return;

		handle = ACPI_HANDLE(adap->dev.parent);
		if (!handle)
		return;

		acpi_walk_dep_device_list(handle);
		}

		static const struct acpi_device_id i2c_acpi_force_400khz_device_ids[] = {
		@@ -719,7 +729,6 @@ int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
		return -ENOMEM;
		}

		acpi_walk_dep_device_list(handle);
		return 0;
		}

Admin message