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

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

Merge "ASoC: bolero: Check for valid handle before pm_runtime_resume"

parents 74d9fedc f2afc390

asoc/codecs/bolero/bolero-cdc.c

+12 −6
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static int __bolero_reg_read(struct bolero_priv *priv, 
		goto err;

	}



	if (priv->macro_params[VA_MACRO].dev)

		pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);

	current_mclk_mux_macro =

		priv->current_mclk_mux_macro[macro_id];
@@ -125,8 +126,10 @@ static int __bolero_reg_read(struct bolero_priv *priv, 
	priv->macro_params[current_mclk_mux_macro].mclk_fn(

			priv->macro_params[current_mclk_mux_macro].dev, false);

err:

	if (priv->macro_params[VA_MACRO].dev) {

		pm_runtime_mark_last_busy(priv->macro_params[VA_MACRO].dev);

		pm_runtime_put_autosuspend(priv->macro_params[VA_MACRO].dev);

	}

	mutex_unlock(&priv->clk_lock);

	return ret;

}
@@ -143,6 +146,7 @@ static int __bolero_reg_write(struct bolero_priv *priv, 
			"%s: SSR in progress, exit\n", __func__);

		goto err;

	}

	if (priv->macro_params[VA_MACRO].dev)

		ret = pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);

	current_mclk_mux_macro =

		priv->current_mclk_mux_macro[macro_id];
@@ -165,8 +169,10 @@ static int __bolero_reg_write(struct bolero_priv *priv, 
	priv->macro_params[current_mclk_mux_macro].mclk_fn(

			priv->macro_params[current_mclk_mux_macro].dev, false);

err:

	if (priv->macro_params[VA_MACRO].dev) {

		pm_runtime_mark_last_busy(priv->macro_params[VA_MACRO].dev);

		pm_runtime_put_autosuspend(priv->macro_params[VA_MACRO].dev);

	}

	mutex_unlock(&priv->clk_lock);

	return ret;

}