diff options
| author |  Andy Shevchenko <andriy.shevchenko@linux.intel.com>
| 2023-01-12 13:28:52 +0200 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2023-01-12 16:25:08 +0000 |
| commit | 64e57b2195725c1ae2246a8a2ce224abb60620ac (patch) | |
| tree | 7d10cf7190c794c9afd81a57422e387a42dcf6f4 /sound/soc/intel/boards/sof_es8336.c | |
| parent | ASoC: Intel: bytcr_wm5102: Drop reference count of ACPI device after use (diff) | |
| download | linux-64e57b2195725c1ae2246a8a2ce224abb60620ac.tar.gz linux-64e57b2195725c1ae2246a8a2ce224abb60620ac.tar.bz2 linux-64e57b2195725c1ae2246a8a2ce224abb60620ac.zip | |
ASoC: Intel: sof_es8336: Drop reference count of ACPI device after use
Theoretically the device might gone if its reference count drops to 0.
This might be the case when we try to find the first physical node of
the ACPI device. We need to keep reference to it until we get a result
of the above mentioned call. Refactor the code to drop the reference
count at the correct place.
While at it, move to acpi_dev_put() as symmetrical call to the
acpi_dev_get_first_match_dev().
Fixes: a164137ce91a ("ASoC: Intel: add machine driver for SOF+ES8336")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230112112852.67714-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/sof_es8336.c')
| -rw-r--r-- | sound/soc/intel/boards/sof_es8336.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 773e5d1d87d4..894b6610b9e2 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -681,7 +681,6 @@ static int sof_es8336_probe(struct platform_device *pdev) if (adev) { snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev)); - put_device(&adev->dev); dai_links[0].codecs->name = codec_name; /* also fixup codec dai name if relevant */ @@ -692,16 +691,19 @@ static int sof_es8336_probe(struct platform_device *pdev) return -ENXIO; } - ret = snd_soc_fixup_dai_links_platform_name(&sof_es8336_card, - mach->mach_params.platform); - if (ret) - return ret; - codec_dev = acpi_get_first_physical_node(adev); + acpi_dev_put(adev); if (!codec_dev) return -EPROBE_DEFER; priv->codec_dev = get_device(codec_dev); + ret = snd_soc_fixup_dai_links_platform_name(&sof_es8336_card, + mach->mach_params.platform); + if (ret) { + put_device(codec_dev); + return ret; + } + if (quirk & SOF_ES8336_JD_INVERTED) props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted"); |