Merge "asoc: wcd937x: Fix compile error in wcd937x codec driver"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
26247b9b1c
@@ -1310,7 +1310,7 @@ static int wcd937x_codec_enable_adc(struct snd_soc_dapm_widget *w,
|
||||
/* Enable BCS for Headset mic */
|
||||
if (w->shift == 1 && !(snd_soc_component_read32(component,
|
||||
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);
|
||||
}
|
||||
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);
|
||||
if (w->shift == 1 &&
|
||||
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);
|
||||
}
|
||||
snd_soc_component_update_bits(component,
|
||||
|
Reference in New Issue
Block a user