diff options
| -rw-r--r-- | sound/soc/pxa/palm27x.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 910336c5ebeb..c20bbc042425 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
| @@ -75,17 +75,12 @@ static struct snd_soc_card palm27x_asoc; | |||
| 75 | 75 | ||
| 76 | static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd) | 76 | static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd) |
| 77 | { | 77 | { |
| 78 | struct snd_soc_codec *codec = rtd->codec; | ||
| 79 | int err; | 78 | int err; |
| 80 | 79 | ||
| 81 | /* Jack detection API stuff */ | 80 | /* Jack detection API stuff */ |
| 82 | err = snd_soc_jack_new(codec, "Headphone Jack", | 81 | err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", |
| 83 | SND_JACK_HEADPHONE, &hs_jack); | 82 | SND_JACK_HEADPHONE, &hs_jack, hs_jack_pins, |
| 84 | if (err) | 83 | ARRAY_SIZE(hs_jack_pins)); |
| 85 | return err; | ||
| 86 | |||
| 87 | err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), | ||
| 88 | hs_jack_pins); | ||
| 89 | if (err) | 84 | if (err) |
| 90 | return err; | 85 | return err; |
| 91 | 86 | ||
