summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/byt-max98090.c
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-06-23 16:29:40 +0300
committerMark Brown <broonie@linaro.org>2014-06-24 16:20:43 +0100
commit24988992932612ba1c069ad597125dbce3e19621 (patch)
treefc1ccde67c54f9e068eae7e6fe839505db3c3382 /sound/soc/intel/byt-max98090.c
parent6a0cdccad87a7032440f204c04a599e4bcc8656b (diff)
ASoC: Intel: byt-max98090: Fix jack type in order to report correctly
Pass actual jack type bitmask to snd_soc_jack_new() in order to report also microphone detections and not only headphone. While at it change also jack name and pass also SND_JACK_LINEOUT type. Reported-by: Jin Yao <yao.jin@intel.com> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/byt-max98090.c')
-rw-r--r--sound/soc/intel/byt-max98090.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c
index 165ab6d6c4a..3e2e7152ae6 100644
--- a/sound/soc/intel/byt-max98090.c
+++ b/sound/soc/intel/byt-max98090.c
@@ -108,7 +108,8 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime)
}
/* Enable jack detection */
- ret = snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, jack);
+ ret = snd_soc_jack_new(codec, "Headset",
+ SND_JACK_LINEOUT | SND_JACK_HEADSET, jack);
if (ret)
return ret;