diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2022-02-21 11:33:57 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2022-02-21 11:33:57 +0100 |
commit | d2206fcabdfaff3958ab67cc5b8f63257e57b889 (patch) | |
tree | f6bc697bb2d10e49e5123b4e0cc30c11aafc3120 /sound/soc/soc-acpi.c | |
parent | fe13889c390e14205e064d7e159e61eb5da4b1c3 (diff) | |
parent | 509853f9e1e7b1490dc79f735a5dbafc9298f40d (diff) | |
download | linux-d2206fcabdfaff3958ab67cc5b8f63257e57b889.tar.bz2 |
Merge tag 'irq-api-2022-02-21' into irq/core
Merge the generic_handle_irq_safe() API back into irq/core.
Diffstat (limited to 'sound/soc/soc-acpi.c')
-rw-r--r-- | sound/soc/soc-acpi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index cbd7ea48837b..142476f1396f 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -55,16 +55,13 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_find_machine); static acpi_status snd_soc_acpi_find_package(acpi_handle handle, u32 level, void *context, void **ret) { - struct acpi_device *adev; + struct acpi_device *adev = acpi_fetch_acpi_dev(handle); acpi_status status; struct snd_soc_acpi_package_context *pkg_ctx = context; pkg_ctx->data_valid = false; - if (acpi_bus_get_device(handle, &adev)) - return AE_OK; - - if (adev->status.present && adev->status.functional) { + if (adev && adev->status.present && adev->status.functional) { struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; union acpi_object *myobj = NULL; |