summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/rx51.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-03-04 10:33:28 +0100
committerMark Brown <broonie@kernel.org>2015-03-04 17:10:42 +0000
commit753d45e6b886c93a2a8a88eddaca345643a87f4e (patch)
tree40f6f06991699dfffb53cd246cc013201da4ccb8 /sound/soc/omap/rx51.c
parentda21cf6d65283680247da74c3d03f7e5cdfb40d1 (diff)
downloadlinux-stable-753d45e6b886c93a2a8a88eddaca345643a87f4e.tar.gz
linux-stable-753d45e6b886c93a2a8a88eddaca345643a87f4e.tar.bz2
linux-stable-753d45e6b886c93a2a8a88eddaca345643a87f4e.zip
ASoC: rx51: 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/omap/rx51.c')
-rw-r--r--sound/soc/omap/rx51.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 7f299357c2d2..c2ddf0fbfa28 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -311,9 +311,9 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
}
/* AV jack detection */
- err = snd_soc_jack_new(codec, "AV Jack",
- SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
- &rx51_av_jack);
+ err = snd_soc_card_jack_new(rtd->card, "AV Jack",
+ SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
+ &rx51_av_jack, NULL, 0);
if (err) {
dev_err(card->dev, "Failed to add AV Jack\n");
return err;