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>
This commit is contained in:
parent
e9c9a723ee
commit
55b2ed2d9d
1 changed files with 4 additions and 7 deletions
|
@ -151,13 +151,10 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
|
snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
|
||||||
|
|
||||||
/* Headphone jack detection */
|
/* Headphone jack detection */
|
||||||
err = snd_soc_jack_new(codec, "Headphone Jack",
|
err = snd_soc_card_jack_new(rtd->card, "Headphone Jack",
|
||||||
SND_JACK_HEADPHONE, &smartq_jack);
|
SND_JACK_HEADPHONE, &smartq_jack,
|
||||||
if (err)
|
smartq_jack_pins,
|
||||||
return err;
|
ARRAY_SIZE(smartq_jack_pins));
|
||||||
|
|
||||||
err = snd_soc_jack_add_pins(&smartq_jack, ARRAY_SIZE(smartq_jack_pins),
|
|
||||||
smartq_jack_pins);
|
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue