From: Jarkko Nikula Date: Mon, 23 Jun 2014 13:29:42 +0000 (+0300) Subject: ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection X-Git-Tag: v3.17-rc1~101^2~5^2~20^2~1^3~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab6f7d0d932313cedfb1696e0536bdbe661cd9c9;hp=24988992932612ba1c069ad597125dbce3e19621;p=karo-tx-linux.git ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection It turned out there is no need to enable microphone detection in MAX98090 codec. Headset microphone is anyway detected by a GPIO signal from another chip and headset button presses cannot be detected either because a signal needed for it is not connected. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index 3e2e7152ae66..5cfb41ec3fab 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/byt-max98090.c @@ -118,13 +118,9 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) if (ret) return ret; - ret = snd_soc_jack_add_gpiods(card->dev->parent, jack, - ARRAY_SIZE(hs_jack_gpios), - hs_jack_gpios); - if (ret) - return ret; - - return max98090_mic_detect(codec, jack); + return snd_soc_jack_add_gpiods(card->dev->parent, jack, + ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); } static struct snd_soc_dai_link byt_max98090_dais[] = {