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

ASoC: lowland: 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 39ec5109

sound/soc/samsung/lowland.c

+4 −10
Original line number Diff line number Diff line
@@ -56,16 +56,10 @@ static int lowland_wm5100_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	ret = snd_soc_jack_new(codec, "Headset",

			       SND_JACK_LINEOUT | SND_JACK_HEADSET |

			       SND_JACK_BTN_0,

			       &lowland_headset);

	if (ret)

		return ret;



	ret = snd_soc_jack_add_pins(&lowland_headset,

				    ARRAY_SIZE(lowland_headset_pins),

				    lowland_headset_pins);

	ret = snd_soc_card_jack_new(rtd->card, "Headset", SND_JACK_LINEOUT |

				    SND_JACK_HEADSET | SND_JACK_BTN_0,

				    &lowland_headset, lowland_headset_pins,

				    ARRAY_SIZE(lowland_headset_pins));

	if (ret)

		return ret;