openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lars-Peter Clausen 2015-03-04 10:33:28 +01:00 committed by Mark Brown
parent da21cf6d65
commit 753d45e6b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/omap/rx51.c
View File

@ -311,9 +311,9 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
} }
/* AV jack detection */ /* AV jack detection */
err = snd_soc_jack_new(codec, "AV Jack", err = snd_soc_card_jack_new(rtd->card, "AV Jack",
SND_JACK_HEADSET | SND_JACK_VIDEOOUT, SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
&rx51_av_jack); &rx51_av_jack, NULL, 0);
if (err) { if (err) {
dev_err(card->dev, "Failed to add AV Jack\n"); dev_err(card->dev, "Failed to add AV Jack\n");
return err; return err;