summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBanajit Goswami <bgoswami@codeaurora.org>2017-05-26 16:35:08 -0700
committerBanajit Goswami <bgoswami@codeaurora.org>2017-05-26 16:49:06 -0700
commit90a6f3415969080a2feed1f12f044407343ab81a (patch)
treed6ed7ff8390e4cfc310ff7f749d994e25de4f2c3
parent60be71604a84d2e047215cb702d6324379a353bb (diff)
ASoC: msm8998: fix clock refcount for MI2S/AUXPCM shutdown
For MI2S and AUXPCM shutdown, if clock disable is failed, do not bother to re-increment clock reference. Otherwise, next time when startup is called, clock enable will not be called again, so use case will not work. Change-Id: I5ce4590d2a2030f9d00f1dba9577396f7685a87b Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
-rw-r--r--sound/soc/msm/msm8998.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c
index f6a5d1344568..1f292b9c4787 100644
--- a/sound/soc/msm/msm8998.c
+++ b/sound/soc/msm/msm8998.c
@@ -4078,7 +4078,6 @@ static void msm_aux_pcm_snd_shutdown(struct snd_pcm_substream *substream)
dev_err(rtd->card->dev,
"%s lpaif_tert_muxsel_virt_addr is NULL\n",
__func__);
- auxpcm_intf_conf[index].ref_cnt++;
}
}
mutex_unlock(&auxpcm_intf_conf[index].lock);
@@ -4567,11 +4566,9 @@ static void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
mutex_lock(&mi2s_intf_conf[index].lock);
if (--mi2s_intf_conf[index].ref_cnt == 0) {
ret = msm_mi2s_set_sclk(substream, false);
- if (ret < 0) {
+ if (ret < 0)
pr_err("%s:clock disable failed for MI2S (%d); ret=%d\n",
__func__, index, ret);
- mi2s_intf_conf[index].ref_cnt++;
- }
}
mutex_unlock(&mi2s_intf_conf[index].lock);