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

Merge "asoc: wcd937x: Fix compile error in wcd937x codec driver"

Browse Source
This commit is contained in:
qctecmdr
2019-10-16 23:32:44 -07:00
committed by Gerrit - the friendly Code Review server
parent 731807e0a2 57e66c0251
commit 26247b9b1c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -1310,7 +1310,7 @@ static int wcd937x_codec_enable_adc(struct snd_soc_dapm_widget *w,
/* Enable BCS for Headset mic */ /* Enable BCS for Headset mic */
if (w->shift == 1 && !(snd_soc_component_read32(component, if (w->shift == 1 && !(snd_soc_component_read32(component,
WCD937X_TX_NEW_TX_CH2_SEL) & 0x80)) { WCD937X_TX_NEW_TX_CH2_SEL) & 0x80)) {
wcd937x_tx_connect_port(codec, MBHC, true); wcd937x_tx_connect_port(component, MBHC, true);
set_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask); set_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask);
} }
wcd937x_tx_connect_port(component, ADC1 + (w->shift), true); wcd937x_tx_connect_port(component, ADC1 + (w->shift), true);
@@ -1319,7 +1319,7 @@ static int wcd937x_codec_enable_adc(struct snd_soc_dapm_widget *w,
wcd937x_tx_connect_port(component, ADC1 + (w->shift), false); wcd937x_tx_connect_port(component, ADC1 + (w->shift), false);
if (w->shift == 1 && if (w->shift == 1 &&
test_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask)) { test_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask)) {
wcd937x_tx_connect_port(codec, MBHC, false); wcd937x_tx_connect_port(component, MBHC, false);
clear_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask); clear_bit(AMIC2_BCS_ENABLE, &wcd937x->status_mask);
} }
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,