diff options
| -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 9cf7d01479ad..9effa3da982f 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) | |||
| 80 | { | 80 | { |
| 81 | struct snd_soc_codec *codec = rtd->codec; | 81 | struct snd_soc_codec *codec = rtd->codec; |
| 82 | int ret = 0; | 82 | int ret = 0; |
| 83 | ret = snd_soc_jack_new(codec, "Headset", | 83 | ret = snd_soc_card_jack_new(rtd->card, "Headset", |
| 84 | SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset); | 84 | SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset, |
| 85 | 85 | broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins)); | |
| 86 | if (ret) | ||
| 87 | return ret; | ||
| 88 | |||
| 89 | ret = snd_soc_jack_add_pins(&broadwell_headset, | ||
| 90 | ARRAY_SIZE(broadwell_headset_pins), | ||
| 91 | broadwell_headset_pins); | ||
| 92 | if (ret) | 86 | if (ret) |
| 93 | return ret; | 87 | return ret; |
| 94 | 88 | ||
