diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-17 03:13:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-17 03:13:25 -0700 |
| commit | bd37ebb718a257a6f4cd6f00a4b1f0e6bfd9b5b7 (patch) | |
| tree | 0879b562e4cb61fd09f06307874472d702e948b0 | |
| parent | e0388e13d9bb748b3bba739e6dc580a462040ce1 (diff) | |
| parent | 44454d128abc26b3507619f59a6bdcb8dd197c8c (diff) | |
Merge "ASoC: sdm660: fix clock refcount for MI2S shutdown"
| -rw-r--r-- | sound/soc/msm/sdm660-common.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/msm/sdm660-common.c b/sound/soc/msm/sdm660-common.c index 90b661dff7ec..271697747dd2 100644 --- a/sound/soc/msm/sdm660-common.c +++ b/sound/soc/msm/sdm660-common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -2552,11 +2552,9 @@ 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++; - } if (mi2s_intf_conf[index].msm_is_ext_mclk) { mi2s_mclk[index].enable = 0; pr_debug("%s: Disabling mclk, clk_freq_in_hz = %u\n", |