diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:42 +0000 |
| commit | f7a4433b498384f0e300c51b654910f3e03b5ca6 (patch) | |
| tree | 1ce327ce816df1ab0834a6164c59013dc0ffb150 /sound/soc/pxa | |
| parent | 753d45e6b886c93a2a8a88eddaca345643a87f4e (diff) | |
| download | linux-stable-f7a4433b498384f0e300c51b654910f3e03b5ca6.tar.gz linux-stable-f7a4433b498384f0e300c51b654910f3e03b5ca6.tar.bz2 linux-stable-f7a4433b498384f0e300c51b654910f3e03b5ca6.zip | |
ASoC: hx4700: Register jacks at the card level
The jacks are card level elements so use snd_soc_card_jack_new() instead of
snd_soc_jack_new() to register them.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa')
| -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[] = { */ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; int err; /* Jack detection API stuff */ - err = snd_soc_jack_new(codec, "Headphone Jack", - SND_JACK_HEADPHONE, &hs_jack); - if (err) - return err; - - err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pin), - hs_jack_pin); + err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &hs_jack, hs_jack_pin, + ARRAY_SIZE(hs_jack_pin)); if (err) return err; |