Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd37ebb7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents e0388e13 44454d12

sound/soc/msm/sdm660-common.c

+2 −4
Original line number Diff line number Diff line 
/* 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",