Merge "asoc: bolero: set bolero dev_up flag before macro notification" (2bc51f99) · Commits · e / devices / android_kernel_oneplus_sm8150

asoc/codecs/bolero/bolero-cdc.c

+4 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, 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
		@@ -568,6 +568,9 @@ static int bolero_ssr_enable(struct device dev, void data)
		BOLERO_MACRO_EVT_WAIT_VA_CLK_RESET, 0x0);

		regcache_cache_only(priv->regmap, false);
		mutex_lock(&priv->clk_lock);
		priv->dev_up = true;
		mutex_unlock(&priv->clk_lock);
		/* call ssr event for supported macros */
		for (macro_idx = START_MACRO; macro_idx < MAX_MACRO; macro_idx++) {
		if (!priv->macro_params[macro_idx].event_handler)
		@@ -575,9 +578,6 @@ static int bolero_ssr_enable(struct device dev, void data)
		priv->macro_params[macro_idx].event_handler(priv->codec,
		BOLERO_MACRO_EVT_SSR_UP, 0x0);
		}
		mutex_lock(&priv->clk_lock);
		priv->dev_up = true;
		mutex_unlock(&priv->clk_lock);
		bolero_cdc_notifier_call(priv, BOLERO_WCD_EVT_SSR_UP);
		return 0;
		}