evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: sdm660: fix clock refcount for MI2S shutdown"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-17 03:13:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit bd37ebb718
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/msm/sdm660-common.c
View file

@ -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 * 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 * 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); mutex_lock(&mi2s_intf_conf[index].lock);
if (--mi2s_intf_conf[index].ref_cnt == 0) { if (--mi2s_intf_conf[index].ref_cnt == 0) {
ret = msm_mi2s_set_sclk(substream, false); 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", pr_err("%s:clock disable failed for MI2S (%d); ret=%d\n",
__func__, index, ret); __func__, index, ret);
mi2s_intf_conf[index].ref_cnt++;
}
if (mi2s_intf_conf[index].msm_is_ext_mclk) { if (mi2s_intf_conf[index].msm_is_ext_mclk) {
mi2s_mclk[index].enable = 0; mi2s_mclk[index].enable = 0;
pr_debug("%s: Disabling mclk, clk_freq_in_hz = %u\n", pr_debug("%s: Disabling mclk, clk_freq_in_hz = %u\n",