Commit 3fd94f37 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: tobermory: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 663976ad
...@@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card) ...@@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = snd_soc_jack_new(codec, "Headset", ret = snd_soc_card_jack_new(card, "Headset", SND_JACK_HEADSET |
SND_JACK_HEADSET | SND_JACK_BTN_0, SND_JACK_BTN_0, &tobermory_headset,
&tobermory_headset); tobermory_headset_pins,
if (ret) ARRAY_SIZE(tobermory_headset_pins));
return ret;
ret = snd_soc_jack_add_pins(&tobermory_headset,
ARRAY_SIZE(tobermory_headset_pins),
tobermory_headset_pins);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment