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

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

Merge "asoc: msm_sdw: Handle locking for mclk enable flag"

parents 3d7a5eb5 132849b5

asoc/codecs/msm_sdw/msm_sdw_cdc.c

+6 −2
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ static int msm_sdw_ahb_write_device(struct msm_sdw_priv *msm_sdw, 
{

	u32 temp = (u32)(*value) & 0x000000FF;



	if (!msm_sdw->dev_up) {

	if (!msm_sdw->dev_up ||

	    !q6core_is_adsp_ready()) {

		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",

				    __func__);

		return 0;
@@ -338,7 +339,8 @@ static int msm_sdw_ahb_read_device(struct msm_sdw_priv *msm_sdw, 
{

	u32 temp;



	if (!msm_sdw->dev_up) {

	if (!msm_sdw->dev_up ||

	    !q6core_is_adsp_ready()) {

		dev_err_ratelimited(msm_sdw->dev, "%s: q6 not ready\n",

				    __func__);

		return 0;
@@ -1756,7 +1758,9 @@ static int msm_sdw_notifier_service_cb(struct notifier_block *nb, 
			initial_boot = false;

			break;

		}

		mutex_lock(&msm_sdw->cdc_int_mclk1_mutex);

		msm_sdw->int_mclk1_enabled = false;

		mutex_unlock(&msm_sdw->cdc_int_mclk1_mutex);

		msm_sdw->dev_up = false;

		snd_soc_card_change_online_state(

			msm_sdw->codec->component.card, 0);