| Message ID | 20230102203014.16041-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,1/6] ASoC: amd: acp-es8336: Drop reference count of ACPI device after use | expand |
On 1/2/23 14:30, Andy Shevchenko wrote: > 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: 3c22a73fb873 ("ASoC: Intel: bytcht_es8316: fix HID handling") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> How do we proceed for this patchset? I am happy to ack a v2 if Andy splits the AMD and Intel patches w/ a cover letter, but this could also be added directly if there is no objection.
On Tue, Jan 10, 2023 at 07:20:08PM -0600, Pierre-Louis Bossart wrote: > On 1/2/23 14:30, Andy Shevchenko wrote: > > 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: 3c22a73fb873 ("ASoC: Intel: bytcht_es8316: fix HID handling") > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > How do we proceed for this patchset? I am happy to ack a v2 if Andy > splits the AMD and Intel patches w/ a cover letter, but this could also > be added directly if there is no objection. I have split out the AMD stuff, so I will resend v2 without it and with cover letter.
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 09d1f0f6d686..df157b01df8b 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -497,21 +497,28 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) if (adev) { snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev)); - put_device(&adev->dev); byt_cht_es8316_dais[dai_index].codecs->name = codec_name; } else { dev_err(dev, "Error cannot find '%s' dev\n", mach->id); return -ENXIO; } + 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); + /* override platform name, if required */ byt_cht_es8316_card.dev = dev; platform_name = mach->mach_params.platform; ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card, platform_name); - if (ret) + if (ret) { + put_device(codec_dev); return ret; + } /* Check for BYTCR or other platform and setup quirks */ dmi_id = dmi_first_match(byt_cht_es8316_quirk_table); @@ -539,13 +546,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) /* get the clock */ priv->mclk = devm_clk_get(dev, "pmc_plt_clk_3"); - if (IS_ERR(priv->mclk)) + if (IS_ERR(priv->mclk)) { + put_device(codec_dev); return dev_err_probe(dev, PTR_ERR(priv->mclk), "clk_get pmc_plt_clk_3 failed\n"); - - codec_dev = acpi_get_first_physical_node(adev); - if (!codec_dev) - return -EPROBE_DEFER; - priv->codec_dev = get_device(codec_dev); + } if (quirk & BYT_CHT_ES8316_JD_INVERTED) props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");
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: 3c22a73fb873 ("ASoC: Intel: bytcht_es8316: fix HID handling") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- sound/soc/intel/boards/bytcht_es8316.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)