diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:43 +0000 |
| commit | bc1e2e06a07ad4c0c021165b34fa8259bdf4d8c6 (patch) | |
| tree | 3fe98de099c68dc4e01e6aa0d5169fc3614b54ff /sound/soc/pxa | |
| parent | f7a4433b498384f0e300c51b654910f3e03b5ca6 (diff) | |
| download | talos-obmc-linux-bc1e2e06a07ad4c0c021165b34fa8259bdf4d8c6.tar.gz talos-obmc-linux-bc1e2e06a07ad4c0c021165b34fa8259bdf4d8c6.zip | |
ASoC: palm27x: 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/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; static int palm27x_ac97_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_pins), - hs_jack_pins); + err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &hs_jack, hs_jack_pins, + ARRAY_SIZE(hs_jack_pins)); if (err) return err; |
