Browse Source

Merge "asoc: lpass-cdc: avoid enabling VA_MCLk when requested clk is not default clk"

qctecmdr 3 years ago
parent
commit
f0f7494128
1 changed files with 5 additions and 3 deletions
  1. 5 3
      asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.c

+ 5 - 3
asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.c

@@ -510,10 +510,12 @@ int lpass_cdc_clk_rsc_request_clock(struct device *dev,
 		mux_switch = true;
 
 	if (mux_switch) {
-		ret = lpass_cdc_clk_rsc_mux1_clk_request(priv, clk_id_req,
+		if (clk_id_req != VA_CORE_CLK) {
+			ret = lpass_cdc_clk_rsc_mux1_clk_request(priv, clk_id_req,
 							enable);
-		if (ret < 0)
-			goto err;
+			if (ret < 0)
+				goto err;
+		}
 	} else {
 		ret = lpass_cdc_clk_rsc_mux0_clk_request(priv, clk_id_req, enable);
 		if (ret < 0)