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 compilation issue in mbhc"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-08-30 21:01:03 -07:00
committed by Gerrit - the friendly Code Review server
parent adf08dfb4f f747677234
commit fe11def3f2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -757,7 +757,7 @@ static bool wcd937x_mbhc_get_moisture_status(struct wcd_mbhc *mbhc)
/* If moisture_en is already enabled, then skip to plug type /* If moisture_en is already enabled, then skip to plug type
* detection. * detection.
*/ */
if ((snd_soc_update_bits(codec, WCD937X_MBHC_NEW_CTL_2) & 0x0C)) if ((snd_soc_read(codec, WCD937X_MBHC_NEW_CTL_2) & 0x0C))
goto done; goto done;
wcd937x_mbhc_moisture_detect_en(mbhc, true); wcd937x_mbhc_moisture_detect_en(mbhc, true);
@@ -773,6 +773,8 @@ done:
static void wcd937x_mbhc_moisture_polling_ctrl(struct wcd_mbhc *mbhc, static void wcd937x_mbhc_moisture_polling_ctrl(struct wcd_mbhc *mbhc,
bool enable) bool enable)
{ {
struct snd_soc_codec *codec = mbhc->codec;
snd_soc_update_bits(codec, snd_soc_update_bits(codec,
WCD937X_MBHC_NEW_INT_MOISTURE_DET_POLLING_CTRL, WCD937X_MBHC_NEW_INT_MOISTURE_DET_POLLING_CTRL,
0x04, (enable << 2)); 0x04, (enable << 2));