diff options
-rw-r--r-- | sound/soc/intel/byt-max98090.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index 9832afe7d22c..d8b1f038da1c 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/byt-max98090.c | |||
@@ -84,7 +84,6 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = { | |||
84 | static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) | 84 | static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) |
85 | { | 85 | { |
86 | int ret; | 86 | int ret; |
87 | struct snd_soc_codec *codec = runtime->codec; | ||
88 | struct snd_soc_card *card = runtime->card; | 87 | struct snd_soc_card *card = runtime->card; |
89 | struct byt_max98090_private *drv = snd_soc_card_get_drvdata(card); | 88 | struct byt_max98090_private *drv = snd_soc_card_get_drvdata(card); |
90 | struct snd_soc_jack *jack = &drv->jack; | 89 | struct snd_soc_jack *jack = &drv->jack; |
@@ -100,13 +99,9 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) | |||
100 | } | 99 | } |
101 | 100 | ||
102 | /* Enable jack detection */ | 101 | /* Enable jack detection */ |
103 | ret = snd_soc_jack_new(codec, "Headset", | 102 | ret = snd_soc_card_jack_new(runtime->card, "Headset", |
104 | SND_JACK_LINEOUT | SND_JACK_HEADSET, jack); | 103 | SND_JACK_LINEOUT | SND_JACK_HEADSET, jack, |
105 | if (ret) | 104 | hs_jack_pins, ARRAY_SIZE(hs_jack_pins)); |
106 | return ret; | ||
107 | |||
108 | ret = snd_soc_jack_add_pins(jack, ARRAY_SIZE(hs_jack_pins), | ||
109 | hs_jack_pins); | ||
110 | if (ret) | 105 | if (ret) |
111 | return ret; | 106 | return ret; |
112 | 107 | ||