diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-17 13:16:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-17 13:16:27 +0100 |
| commit | 3ee5990d0835d5f10c9aad2a856860a213df638a (patch) | |
| tree | 573fb14e6abc12cb3e9e690702d425da41a90b95 /sound/soc/intel/broadwell.c | |
| parent | Merge branch 'topic/rt5670' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ASoC: Remove snd_soc_jack_new() (diff) | |
| download | linux-3ee5990d0835d5f10c9aad2a856860a213df638a.tar.xz linux-3ee5990d0835d5f10c9aad2a856860a213df638a.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/broadwell.c')
| -rw-r--r-- | sound/soc/intel/broadwell.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index af5d73070f60..6c75b6bd0049 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -80,15 +80,9 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; int ret = 0; - ret = snd_soc_jack_new(codec, "Headset", - SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset); - - if (ret) - return ret; - - ret = snd_soc_jack_add_pins(&broadwell_headset, - ARRAY_SIZE(broadwell_headset_pins), - broadwell_headset_pins); + ret = snd_soc_card_jack_new(rtd->card, "Headset", + SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset, + broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins)); if (ret) return ret; |