Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/samsung/tobermory.c

+4 −9
Original line number Diff line number Diff line
@@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card) 
	if (ret < 0)

		return ret;



	ret = snd_soc_jack_new(codec, "Headset",

			       SND_JACK_HEADSET | SND_JACK_BTN_0,

			       &tobermory_headset);

	if (ret)

		return ret;



	ret = snd_soc_jack_add_pins(&tobermory_headset,

				    ARRAY_SIZE(tobermory_headset_pins),

				    tobermory_headset_pins);

	ret = snd_soc_card_jack_new(card, "Headset", SND_JACK_HEADSET |

				    SND_JACK_BTN_0, &tobermory_headset,

				    tobermory_headset_pins,

				    ARRAY_SIZE(tobermory_headset_pins));

	if (ret)

		return ret;