evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wcd934x: Initialize mbhc pointer before access"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-02 14:41:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit cf07c20103
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/codecs/wcd934x/wcd934x-mbhc.c
View file

@ -1015,6 +1015,7 @@ int tavil_mbhc_init(struct wcd934x_mbhc **mbhc, struct snd_soc_codec *codec,
0; 0;
} }
(*mbhc) = wcd934x_mbhc;
snd_soc_add_codec_controls(codec, impedance_detect_controls, snd_soc_add_codec_controls(codec, impedance_detect_controls,
ARRAY_SIZE(impedance_detect_controls)); ARRAY_SIZE(impedance_detect_controls));
snd_soc_add_codec_controls(codec, hph_type_detect_controls, snd_soc_add_codec_controls(codec, hph_type_detect_controls,
@ -1023,8 +1024,6 @@ int tavil_mbhc_init(struct wcd934x_mbhc **mbhc, struct snd_soc_codec *codec,
snd_soc_update_bits(codec, WCD934X_MBHC_NEW_CTL_1, 0x04, 0x04); snd_soc_update_bits(codec, WCD934X_MBHC_NEW_CTL_1, 0x04, 0x04);
snd_soc_update_bits(codec, WCD934X_MBHC_CTL_BCS, 0x01, 0x01); snd_soc_update_bits(codec, WCD934X_MBHC_CTL_BCS, 0x01, 0x01);
(*mbhc) = wcd934x_mbhc;
return 0; return 0;
err: err:
devm_kfree(codec->dev, wcd934x_mbhc); devm_kfree(codec->dev, wcd934x_mbhc);