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

ASoC: speyside: 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 55b2ed2d

sound/soc/samsung/speyside.c

+4 −10
Original line number Diff line number Diff line
@@ -153,16 +153,10 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd) 
		pr_err("Failed to request HP_SEL GPIO: %d\n", ret);

	gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);



	ret = snd_soc_jack_new(codec, "Headset",

			       SND_JACK_LINEOUT | SND_JACK_HEADSET |

			       SND_JACK_BTN_0,

			       &speyside_headset);

	if (ret)

		return ret;



	ret = snd_soc_jack_add_pins(&speyside_headset,

				    ARRAY_SIZE(speyside_headset_pins),

				    speyside_headset_pins);

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

				    SND_JACK_HEADSET | SND_JACK_BTN_0,

				    &speyside_headset, speyside_headset_pins,

				    ARRAY_SIZE(speyside_headset_pins));

	if (ret)

		return ret;