diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:44 +0000 |
| commit | f97e0eacf2b5d9c1a470e53df60519d555ac5a75 (patch) | |
| tree | 14a31f4729e15af91eab20bfca26e008f3ad4ee9 /sound/soc/samsung/lowland.c | |
| parent | 39ec5109d6089e1acd04b51b9df5349f5b8a7f5c (diff) | |
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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/lowland.c')
| -rw-r--r-- | sound/soc/samsung/lowland.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 243dea7ba38f..5f156093101e 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -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; |