mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 07:37:31 -04:00
Merge "asoc: bolero: Avoid reg access if audio hw vote fails"
This commit is contained in:
commit
c4322eb5b7
1 changed files with 8 additions and 2 deletions
|
|
@ -101,8 +101,11 @@ static int __bolero_reg_read(struct bolero_priv *priv,
|
|||
goto ssr_err;
|
||||
}
|
||||
|
||||
if (priv->macro_params[VA_MACRO].dev)
|
||||
if (priv->macro_params[VA_MACRO].dev) {
|
||||
pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);
|
||||
if (!bolero_check_core_votes(priv->macro_params[VA_MACRO].dev))
|
||||
goto ssr_err;
|
||||
}
|
||||
|
||||
if (priv->version < BOLERO_VERSION_2_0) {
|
||||
/* Request Clk before register access */
|
||||
|
|
@ -149,8 +152,11 @@ static int __bolero_reg_write(struct bolero_priv *priv,
|
|||
ret = -EINVAL;
|
||||
goto ssr_err;
|
||||
}
|
||||
if (priv->macro_params[VA_MACRO].dev)
|
||||
if (priv->macro_params[VA_MACRO].dev) {
|
||||
pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);
|
||||
if (!bolero_check_core_votes(priv->macro_params[VA_MACRO].dev))
|
||||
goto ssr_err;
|
||||
}
|
||||
|
||||
if (priv->version < BOLERO_VERSION_2_0) {
|
||||
/* Request Clk before register access */
|
||||
|
|
|
|||
Loading…
Reference in a new issue