diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2015-03-04 10:33:23 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-03-04 17:09:52 +0000 |
| commit | fb1edb4b68a829619bcd50a0c23c557000d0d638 (patch) | |
| tree | 7b265fbc80a42169f40b1cf146729d86345350dd /sound/soc/intel/cht_bsw_rt5645.c | |
| parent | ASoC: byt-max98090: Register jacks at the card level (diff) | |
| download | linux-dev-fb1edb4b68a829619bcd50a0c23c557000d0d638.tar.xz linux-dev-fb1edb4b68a829619bcd50a0c23c557000d0d638.zip | |
ASoC: cht_bsw_rt5645: 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/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 bd29617a9ab9..0bfca2192ca0 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; |