diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:43 +0000 |
| commit | d30d141f9cb7eb9fb3f03af11146dc0d2b393ff2 (patch) | |
| tree | 07ce0ae40c21eee5d372e429d9759c6143a0914e | |
| parent | 3b14125bc553a0fe091a5d43a22be41cdc43b156 (diff) | |
| download | linux-stable-d30d141f9cb7eb9fb3f03af11146dc0d2b393ff2.tar.gz linux-stable-d30d141f9cb7eb9fb3f03af11146dc0d2b393ff2.tar.bz2 linux-stable-d30d141f9cb7eb9fb3f03af11146dc0d2b393ff2.zip | |
ASoC: z2: 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>
| -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) snd_soc_dapm_disable_pin(dapm, "MONO1"); /* Jack detection API stuff */ - ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, - &hs_jack); - if (ret) - goto err; - - ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), - hs_jack_pins); + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, + &hs_jack, hs_jack_pins, + ARRAY_SIZE(hs_jack_pins)); if (ret) goto err; |