diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 11:10:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 11:10:23 -0700 |
| commit | 0746c4a9f3d37caf73fb93420bcf34a841019a40 (patch) | |
| tree | 373a70cc994d6943553c7b13cf82ed8593a129da | |
| parent | c10037f8323d2a94acb4fc6ecfbab0cda152fdd6 (diff) | |
| parent | 8058d69905058ec8f467a120b5ec5bb831ea67f3 (diff) | |
| download | linux-0746c4a9f3d37caf73fb93420bcf34a841019a40.tar.gz linux-0746c4a9f3d37caf73fb93420bcf34a841019a40.tar.bz2 linux-0746c4a9f3d37caf73fb93420bcf34a841019a40.zip | |
Merge branch 'i2c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/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
| -rw-r--r-- | drivers/i2c/i2c-core-acpi.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index e627d7b2790f..37c510d9347a 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -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; } |