diff options
Diffstat (limited to 'sound/soc/generic/simple-card.c')
-rw-r--r-- | sound/soc/generic/simple-card.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index fb550b5869d2..c49a408fc7a6 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c | |||
@@ -176,11 +176,11 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) | |||
176 | return ret; | 176 | return ret; |
177 | 177 | ||
178 | if (gpio_is_valid(priv->gpio_hp_det)) { | 178 | if (gpio_is_valid(priv->gpio_hp_det)) { |
179 | snd_soc_jack_new(codec->codec, "Headphones", SND_JACK_HEADPHONE, | 179 | snd_soc_card_jack_new(rtd->card, "Headphones", |
180 | &simple_card_hp_jack); | 180 | SND_JACK_HEADPHONE, |
181 | snd_soc_jack_add_pins(&simple_card_hp_jack, | 181 | &simple_card_hp_jack, |
182 | ARRAY_SIZE(simple_card_hp_jack_pins), | 182 | simple_card_hp_jack_pins, |
183 | simple_card_hp_jack_pins); | 183 | ARRAY_SIZE(simple_card_hp_jack_pins)); |
184 | 184 | ||
185 | simple_card_hp_jack_gpio.gpio = priv->gpio_hp_det; | 185 | simple_card_hp_jack_gpio.gpio = priv->gpio_hp_det; |
186 | simple_card_hp_jack_gpio.invert = priv->gpio_hp_det_invert; | 186 | simple_card_hp_jack_gpio.invert = priv->gpio_hp_det_invert; |
@@ -189,11 +189,11 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) | |||
189 | } | 189 | } |
190 | 190 | ||
191 | if (gpio_is_valid(priv->gpio_mic_det)) { | 191 | if (gpio_is_valid(priv->gpio_mic_det)) { |
192 | snd_soc_jack_new(codec->codec, "Mic Jack", SND_JACK_MICROPHONE, | 192 | snd_soc_card_jack_new(rtd->card, "Mic Jack", |
193 | &simple_card_mic_jack); | 193 | SND_JACK_MICROPHONE, |
194 | snd_soc_jack_add_pins(&simple_card_mic_jack, | 194 | &simple_card_mic_jack, |
195 | ARRAY_SIZE(simple_card_mic_jack_pins), | 195 | simple_card_mic_jack_pins, |
196 | simple_card_mic_jack_pins); | 196 | ARRAY_SIZE(simple_card_mic_jack_pins)); |
197 | simple_card_mic_jack_gpio.gpio = priv->gpio_mic_det; | 197 | simple_card_mic_jack_gpio.gpio = priv->gpio_mic_det; |
198 | simple_card_mic_jack_gpio.invert = priv->gpio_mic_det_invert; | 198 | simple_card_mic_jack_gpio.invert = priv->gpio_mic_det_invert; |
199 | snd_soc_jack_add_gpios(&simple_card_mic_jack, 1, | 199 | snd_soc_jack_add_gpios(&simple_card_mic_jack, 1, |