Skip to content

Commit

Permalink
Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/wsa/linux

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
  • Loading branch information
torvalds committed Oct 25, 2020
2 parents c10037f + 8058d69 commit 0746c4a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/i2c/i2c-core-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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[] = {
Expand Down Expand Up @@ -719,7 +729,6 @@ int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
return -ENOMEM;
}

acpi_walk_dep_device_list(handle);
return 0;
}

Expand Down

0 comments on commit 0746c4a

Please sign in to comment.