diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2021-11-23 17:57:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-11-24 13:57:11 +0100 |
| commit | 86f74ba3fef56dd1cee19b7a15ae27fc0da5bb61 (patch) | |
| tree | 2e0765e56873b1747acb4263a96157776be4fcd3 /sound | |
| parent | ASoC: cs35l41: Set the max SPI speed for the whole device (diff) | |
| download | linux-86f74ba3fef56dd1cee19b7a15ae27fc0da5bb61.tar.xz linux-86f74ba3fef56dd1cee19b7a15ae27fc0da5bb61.zip | |
ASoC: SOF: hda: reset DAI widget before reconfiguring it
It is not unusual for ALSA/ASoC hw_params callbacks to be invoked
multiple times. Reset and free the DAI widget before reconfiguring
it to keep the DAI widget use_count balanced.
Fixes: 0acb48dd31e3 ("ASoC: SOF: Intel: hda: make sure DAI widget is set up before IPC")
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211123165759.127884-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 568d351b7a4e..2c0d4d06ab36 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -58,6 +58,13 @@ int hda_ctrl_dai_widget_setup(struct snd_soc_dapm_widget *w) return -EINVAL; } + /* DAI already configured, reset it before reconfiguring it */ + if (sof_dai->configured) { + ret = hda_ctrl_dai_widget_free(w); + if (ret < 0) + return ret; + } + config = &sof_dai->dai_config[sof_dai->current_config]; /* |