From 1fcf0af78a0929ab48a6a82488878630df5fd933 Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Tue, 25 Oct 2016 18:50:54 -0700 Subject: [PATCH] ASoC: wcd934x: Initialize mbhc pointer before access Initialize mbhc pointer before it gets accessed from a different thread. Change-Id: Ie1a5038458b0b93dfec3e5bfc350686eb1f8eb1b Signed-off-by: Phani Kumar Uppalapati --- sound/soc/codecs/wcd934x/wcd934x-mbhc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/wcd934x/wcd934x-mbhc.c b/sound/soc/codecs/wcd934x/wcd934x-mbhc.c index 64c33c082b4b..5dbdb9a2df00 100644 --- a/sound/soc/codecs/wcd934x/wcd934x-mbhc.c +++ b/sound/soc/codecs/wcd934x/wcd934x-mbhc.c @@ -1015,6 +1015,7 @@ int tavil_mbhc_init(struct wcd934x_mbhc **mbhc, struct snd_soc_codec *codec, 0; } + (*mbhc) = wcd934x_mbhc; snd_soc_add_codec_controls(codec, impedance_detect_controls, ARRAY_SIZE(impedance_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_CTL_BCS, 0x01, 0x01); - (*mbhc) = wcd934x_mbhc; - return 0; err: devm_kfree(codec->dev, wcd934x_mbhc);