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

Merge "ASoC: bolero: check for port validation before configuration"

Browse Source
This commit is contained in:
qctecmdr
2019-08-25 03:14:53 -07:00
committed by Gerrit - the friendly Code Review server
parent a8878c531d c0f75b7727
commit efdfdf2782
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asoc/codecs/bolero/rx-macro.c
View File

@@ -1798,14 +1798,23 @@ static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,
dev_err(rx_dev, "%s:AIF reset already\n", __func__);
return 0;
}
if (aif_rst > RX_MACRO_AIF4_PB) {
dev_err(rx_dev, "%s: Invalid AIF reset\n", __func__);
return 0;
}
}
rx_priv->rx_port_value[widget->shift] = rx_port_value;
dev_dbg(rx_dev, "%s: mux input: %d, mux output: %d, aif_rst: %d\n",
__func__, rx_port_value, widget->shift, aif_rst);
switch (rx_port_value) {
case 0:
clear_bit(widget->shift,
&rx_priv->active_ch_mask[aif_rst]);
rx_priv->active_ch_cnt[aif_rst]--;
if (rx_priv->active_ch_cnt[aif_rst]) {
clear_bit(widget->shift,
&rx_priv->active_ch_mask[aif_rst]);
rx_priv->active_ch_cnt[aif_rst]--;
}
break;
case 1:
case 2:
@@ -1817,7 +1826,8 @@ static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,
break;
default:
dev_err(component->dev,
"%s:Invalid AIF_ID for RX_MACRO MUX\n", __func__);
"%s:Invalid AIF_ID for RX_MACRO MUX %d\n",
__func__, rx_port_value);
goto err;
}