diff options
| author | Rander Wang <rander.wang@intel.com> | 2020-08-25 16:50:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-26 13:19:12 +0100 |
| commit | 6c63c954e1c52f1262f986f36d95f557c6f8fa94 (patch) | |
| tree | 26421b52c64f563deeccfb937c2c4270cb7eb1f3 /sound/soc | |
| parent | 53ec753137f2a407c949cef3158e89ece7688637 (diff) | |
| download | linux-stable-6c63c954e1c52f1262f986f36d95f557c6f8fa94.tar.gz linux-stable-6c63c954e1c52f1262f986f36d95f557c6f8fa94.tar.bz2 linux-stable-6c63c954e1c52f1262f986f36d95f557c6f8fa94.zip | |
ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesn't work
When hda_codec_probe() doesn't initialize audio component, we disable
the codec and keep going. However,the resources are not released. The
child_count of SOF device is increased in snd_hdac_ext_bus_device_init
but is not decrease in error case, so SOF can't get suspended.
snd_hdac_ext_bus_device_exit will be invoked in HDA framework if it
gets a error. Now copy this behavior to release resources and decrease
SOF device child_count to release SOF device.
Signed-off-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200825235040.1586478-3-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sof/intel/hda-codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 55811b99e47a..f6ba3b593e1f 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, if (!hdev->bus->audio_component) { dev_dbg(sdev->dev, "iDisp hw present but no driver\n"); - return -ENOENT; + goto error; } hda_priv->need_display_power = true; } @@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, * other return codes without modification */ if (ret == 0) - ret = -ENOENT; + goto error; } return ret; |