diff options
| author | Lars-Peter Clausen | 2015-03-04 10:33:24 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-03-04 18:10:16 +0100 |
| commit | af13cbc1a288d3921f1af739da84371e6c53aea3 (patch) | |
| tree | d745ebbe576a364c3c18a9949640a68310822d5e /sound/soc/intel/mfld_machine.c | |
| parent | ASoC: cht_bsw_rt5645: Register jacks at the card level (diff) | |
| download | kernel-qcow2-linux-af13cbc1a288d3921f1af739da84371e6c53aea3.tar.gz kernel-qcow2-linux-af13cbc1a288d3921f1af739da84371e6c53aea3.tar.xz kernel-qcow2-linux-af13cbc1a288d3921f1af739da84371e6c53aea3.zip | |
ASoC: mfld_machine: 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>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/mfld_machine.c')
| -rw-r--r-- | sound/soc/intel/mfld_machine.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/mfld_machine.c index d22b44db824e..49c09a0add79 100644 --- a/sound/soc/intel/mfld_machine.c +++ b/sound/soc/intel/mfld_machine.c @@ -255,20 +255,15 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime) snd_soc_dapm_disable_pin(dapm, "LINEINR"); /* Headset and button jack detection */ - ret_val = snd_soc_jack_new(runtime->codec, "Intel(R) MID Audio Jack", - SND_JACK_HEADSET | SND_JACK_BTN_0 | - SND_JACK_BTN_1, &mfld_jack); + ret_val = snd_soc_card_jack_new(runtime->card, + "Intel(R) MID Audio Jack", SND_JACK_HEADSET | + SND_JACK_BTN_0 | SND_JACK_BTN_1, &mfld_jack, + mfld_jack_pins, ARRAY_SIZE(mfld_jack_pins)); if (ret_val) { pr_err("jack creation failed\n"); return ret_val; } - ret_val = snd_soc_jack_add_pins(&mfld_jack, - ARRAY_SIZE(mfld_jack_pins), mfld_jack_pins); - if (ret_val) { - pr_err("adding jack pins failed\n"); - return ret_val; - } ret_val = snd_soc_jack_add_zones(&mfld_jack, ARRAY_SIZE(mfld_zones), mfld_zones); if (ret_val) { |