diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-03-17 12:16:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-17 12:16:27 +0000 |
| commit | 3ee5990d0835d5f10c9aad2a856860a213df638a (patch) | |
| tree | 573fb14e6abc12cb3e9e690702d425da41a90b95 /sound/soc/intel/cht_bsw_rt5645.c | |
| parent | Merge branch 'topic/rt5670' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel (diff) | |
| parent | ASoC: Remove snd_soc_jack_new() (diff) | |
| download | linux-dev-3ee5990d0835d5f10c9aad2a856860a213df638a.tar.xz linux-dev-3ee5990d0835d5f10c9aad2a856860a213df638a.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/cht_bsw_rt5645.c')
| -rw-r--r-- | sound/soc/intel/cht_bsw_rt5645.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/intel/cht_bsw_rt5645.c b/sound/soc/intel/cht_bsw_rt5645.c index dd935255a020..012227997ed9 100644 --- a/sound/soc/intel/cht_bsw_rt5645.c +++ b/sound/soc/intel/cht_bsw_rt5645.c @@ -169,17 +169,17 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - ret = snd_soc_jack_new(codec, "Headphone Jack", - SND_JACK_HEADPHONE, - &ctx->hp_jack); + ret = snd_soc_card_jack_new(runtime->card, "Headphone Jack", + SND_JACK_HEADPHONE, &ctx->hp_jack, + NULL, 0); if (ret) { dev_err(runtime->dev, "HP jack creation failed %d\n", ret); return ret; } - ret = snd_soc_jack_new(codec, "Mic Jack", - SND_JACK_MICROPHONE, - &ctx->mic_jack); + ret = snd_soc_card_jack_new(runtime->card, "Mic Jack", + SND_JACK_MICROPHONE, &ctx->mic_jack, + NULL, 0); if (ret) { dev_err(runtime->dev, "Mic jack creation failed %d\n", ret); return ret; |