diff options
| -rw-r--r-- | sound/soc/pxa/z2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 76ccb172d0a7..bcbfbe8303f7 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c | |||
| @@ -143,13 +143,9 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) | |||
| 143 | snd_soc_dapm_disable_pin(dapm, "MONO1"); | 143 | snd_soc_dapm_disable_pin(dapm, "MONO1"); |
| 144 | 144 | ||
| 145 | /* Jack detection API stuff */ | 145 | /* Jack detection API stuff */ |
| 146 | ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, | 146 | ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, |
| 147 | &hs_jack); | 147 | &hs_jack, hs_jack_pins, |
| 148 | if (ret) | 148 | ARRAY_SIZE(hs_jack_pins)); |
| 149 | goto err; | ||
| 150 | |||
| 151 | ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), | ||
| 152 | hs_jack_pins); | ||
| 153 | if (ret) | 149 | if (ret) |
| 154 | goto err; | 150 | goto err; |
| 155 | 151 | ||
