diff options
Diffstat (limited to 'sound/soc/pxa/hx4700.c')
| -rw-r--r-- | sound/soc/pxa/hx4700.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 73eb5ddf9753..9f8be7cd567e 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c | |||
| @@ -126,17 +126,12 @@ static const struct snd_soc_dapm_route hx4700_audio_map[] = { | |||
| 126 | */ | 126 | */ |
| 127 | static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd) | 127 | static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd) |
| 128 | { | 128 | { |
| 129 | struct snd_soc_codec *codec = rtd->codec; | ||
| 130 | int err; | 129 | int err; |
| 131 | 130 | ||
| 132 | /* Jack detection API stuff */ | 131 | /* Jack detection API stuff */ |
| 133 | err = snd_soc_jack_new(codec, "Headphone Jack", | 132 | err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", |
| 134 | SND_JACK_HEADPHONE, &hs_jack); | 133 | SND_JACK_HEADPHONE, &hs_jack, hs_jack_pin, |
| 135 | if (err) | 134 | ARRAY_SIZE(hs_jack_pin)); |
| 136 | return err; | ||
| 137 | |||
| 138 | err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pin), | ||
| 139 | hs_jack_pin); | ||
| 140 | if (err) | 135 | if (err) |
| 141 | return err; | 136 | return err; |
| 142 | 137 | ||
