diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:45 +0000 |
| commit | 55b2ed2d9dd8c611837f34ca29df881eb0a1de8d (patch) | |
| tree | c8694a049d1a960e6b9e3b649cbddc0010d7e915 | |
| parent | e9c9a723eea5102fa6adedf454e02fff6201a3c3 (diff) | |
| download | linux-stable-55b2ed2d9dd8c611837f34ca29df881eb0a1de8d.tar.gz linux-stable-55b2ed2d9dd8c611837f34ca29df881eb0a1de8d.tar.bz2 linux-stable-55b2ed2d9dd8c611837f34ca29df881eb0a1de8d.zip | |
ASoC: smartq: 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/samsung/smartq_wm8987.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 8291d2a5f152..dfbe2db1c407 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -151,13 +151,10 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); /* Headphone jack detection */ - err = snd_soc_jack_new(codec, "Headphone Jack", - SND_JACK_HEADPHONE, &smartq_jack); - if (err) - return err; - - err = snd_soc_jack_add_pins(&smartq_jack, ARRAY_SIZE(smartq_jack_pins), - smartq_jack_pins); + err = snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &smartq_jack, + smartq_jack_pins, + ARRAY_SIZE(smartq_jack_pins)); if (err) return err; |