diff options
| author | Jarkko Nikula | 2014-06-23 15:29:40 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-06-24 17:20:43 +0200 |
| commit | 24988992932612ba1c069ad597125dbce3e19621 (patch) | |
| tree | fc1ccde67c54f9e068eae7e6fe839505db3c3382 /sound/soc/intel/byt-max98090.c | |
| parent | ASoC: Intel: byt-max98090: Do not report SND_JACK_LINEIN (diff) | |
| download | kernel-qcow2-linux-24988992932612ba1c069ad597125dbce3e19621.tar.gz kernel-qcow2-linux-24988992932612ba1c069ad597125dbce3e19621.tar.xz kernel-qcow2-linux-24988992932612ba1c069ad597125dbce3e19621.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index 165ab6d6c4a3..3e2e7152ae66 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; |