diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-06 13:21:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-06 13:21:54 -0700 |
| commit | 952a3f35ab256a13a8ffee8d0e179fe75342fa6d (patch) | |
| tree | ca3058013f2658dfbd820a091f6563940702e235 | |
| parent | f7346af2051ca680d4cb5d81d12f446ba2c05069 (diff) | |
| parent | 90a6f3415969080a2feed1f12f044407343ab81a (diff) | |
Merge "ASoC: msm8998: fix clock refcount for MI2S/AUXPCM shutdown"
| -rw-r--r-- | sound/soc/msm/msm8998.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c index 15c596f54926..0b37e7e073aa 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); |