diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 17:10:46 +0000 |
| commit | 12cc6d1dca4d3a9e929090cb0cf9ef452f414518 (patch) | |
| tree | efb87cda1baaec89c440a77e9d6581e90e9909ae /sound | |
| parent | 3fd94f37da000a2b562a3f4e6c553b7ab1ad9e19 (diff) | |
| download | linux-stable-12cc6d1dca4d3a9e929090cb0cf9ef452f414518.tar.gz linux-stable-12cc6d1dca4d3a9e929090cb0cf9ef452f414518.tar.bz2 linux-stable-12cc6d1dca4d3a9e929090cb0cf9ef452f414518.zip | |
ASoC: tegra_alc5632: 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')
| -rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 769aca2fc5f5..6dcd06a966c7 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -106,11 +106,10 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card); - snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, - &tegra_alc5632_hs_jack); - snd_soc_jack_add_pins(&tegra_alc5632_hs_jack, - ARRAY_SIZE(tegra_alc5632_hs_jack_pins), - tegra_alc5632_hs_jack_pins); + snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, + &tegra_alc5632_hs_jack, + tegra_alc5632_hs_jack_pins, + ARRAY_SIZE(tegra_alc5632_hs_jack_pins)); if (gpio_is_valid(machine->gpio_hp_det)) { tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det; |