diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
| commit | c77dc2c203908fe03582770b016ffc7c84242939 (patch) | |
| tree | c85e844917bb40dbc9f9dc19cdc10af87f5624ea /sound/soc/omap/rx51.c | |
| parent | 012baec5c1eaab7ad98b461eb7afae2faf79dbea (diff) | |
| parent | 77c71765ef78f87dd901fcb4c751908e835a3b2e (diff) | |
| download | linux-c77dc2c203908fe03582770b016ffc7c84242939.tar.gz linux-c77dc2c203908fe03582770b016ffc7c84242939.tar.bz2 linux-c77dc2c203908fe03582770b016ffc7c84242939.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tegra
Diffstat (limited to 'sound/soc/omap/rx51.c')
| -rw-r--r-- | sound/soc/omap/rx51.c | 6 |
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; |