diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-03-18 07:56:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-03-18 07:56:54 -0700 |
| commit | 4bccf992f6ede38245abc8d4be8c53c4366da649 (patch) | |
| tree | 7641e7d5912cb9ac789e90bd17357e4f46ae4a7b /asoc/codecs | |
| parent | 2ef9f93fd888c66b27694421fe9e5227e173de98 (diff) | |
| parent | 7ad7274bb0704e82467fe6aadf939e43607c2c53 (diff) | |
| download | msm-extra-4bccf992f6ede38245abc8d4be8c53c4366da649.tar.gz | |
Merge "asoc: bolero: Avoid reg access if audio hw vote fails"
Diffstat (limited to 'asoc/codecs')
| -rw-r--r-- | asoc/codecs/bolero/bolero-cdc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/asoc/codecs/bolero/bolero-cdc.c b/asoc/codecs/bolero/bolero-cdc.c index 49fd1fcb..2db0c5b3 100644 --- a/asoc/codecs/bolero/bolero-cdc.c +++ b/asoc/codecs/bolero/bolero-cdc.c @@ -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 */ |