samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASoC: wsa-macro: Add core vote before accessing registers"

Browse Source
This commit is contained in:
qctecmdr
2020-07-16 23:56:45 -07:00
committed by Gerrit - the friendly Code Review server
parent f40bc141fb de83e87f07
commit ce0d91646a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
asoc/codecs/bolero/wsa-macro.c
View File

@@ -2008,10 +2008,12 @@ static int wsa_macro_set_rx_mute_status(struct snd_kcontrol *kcontrol,
int value = ucontrol->value.integer.value[0]; int value = ucontrol->value.integer.value[0];
int wsa_rx_shift = ((struct soc_multi_mixer_control *) int wsa_rx_shift = ((struct soc_multi_mixer_control *)
kcontrol->private_value)->shift; kcontrol->private_value)->shift;
int ret = 0;
if (!wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__)) if (!wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__))
return -EINVAL; return -EINVAL;
pm_runtime_get_sync(wsa_priv->dev);
switch (wsa_rx_shift) { switch (wsa_rx_shift) {
case 0: case 0:
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,
@@ -2036,13 +2038,16 @@ static int wsa_macro_set_rx_mute_status(struct snd_kcontrol *kcontrol,
default: default:
pr_err("%s: invalid argument rx_shift = %d\n", __func__, pr_err("%s: invalid argument rx_shift = %d\n", __func__,
wsa_rx_shift); wsa_rx_shift);
return -EINVAL; ret = -EINVAL;
} }
pm_runtime_mark_last_busy(wsa_priv->dev);
pm_runtime_put_autosuspend(wsa_priv->dev);
dev_dbg(component->dev, "%s: WSA Digital Mute RX %d Enable %d\n", dev_dbg(component->dev, "%s: WSA Digital Mute RX %d Enable %d\n",
__func__, wsa_rx_shift, value); __func__, wsa_rx_shift, value);
wsa_priv->wsa_digital_mute_status[wsa_rx_shift] = value; wsa_priv->wsa_digital_mute_status[wsa_rx_shift] = value;
return 0;
return ret;
} }
static int wsa_macro_get_compander(struct snd_kcontrol *kcontrol, static int wsa_macro_get_compander(struct snd_kcontrol *kcontrol,