diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-05-17 10:21:12 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-20 15:16:42 +0100 |
commit | f7c4842abfa1a219554a3ffd8c317e8fdd979bec (patch) | |
tree | db49242fb42e2609338cf53f765ef1af49f5536f /sound | |
parent | ad6eecbfc01c987e0253371f274c3872042e4350 (diff) | |
download | linux-stable-f7c4842abfa1a219554a3ffd8c317e8fdd979bec.tar.gz linux-stable-f7c4842abfa1a219554a3ffd8c317e8fdd979bec.tar.bz2 linux-stable-f7c4842abfa1a219554a3ffd8c317e8fdd979bec.zip |
ASoC: soc-dpm: fixup DAI active unbalance
snd_soc_dai_link_event() is updating snd_soc_dai :: active,
but it is unbalance.
It counts up if it has startup callback.
case SND_SOC_DAPM_PRE_PMU:
...
snd_soc_dapm_widget_for_each_source_path(w, path) {
...
if (source->driver->ops->startup) {
...
=> source->active++;
}
...
}
...
But, always counts down
case SND_SOC_DAPM_PRE_PMD:
...
snd_soc_dapm_widget_for_each_source_path(w, path) {
...
=> source->active--;
...
}
This patch always counts up when SND_SOC_DAPM_PRE_PMD.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 65ee0bb5dd0b..62e27defce56 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3828,8 +3828,8 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ret); goto out; } - source->active++; } + source->active++; ret = soc_dai_hw_params(&substream, params, source); if (ret < 0) goto out; @@ -3850,8 +3850,8 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, ret); goto out; } - sink->active++; } + sink->active++; ret = soc_dai_hw_params(&substream, params, sink); if (ret < 0) goto out; |