| Message ID | 1395429831-22561-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 546d4dd3bb99466e4268256bad615a5ed6457a55 |
| Headers | show |
On Fri, Mar 21, 2014 at 08:23:51PM +0100, Lars-Peter Clausen wrote: > Fixes: 115f3f8 ("ASoC: mfld_machine: Convert to table based DAPM and control setup") > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Applied, thanks.
diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/mfld_machine.c index 4616942..031d787 100644 --- a/sound/soc/intel/mfld_machine.c +++ b/sound/soc/intel/mfld_machine.c @@ -254,7 +254,7 @@ 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(codec, "Intel(R) MID Audio Jack", + ret_val = snd_soc_jack_new(mfld_codec, "Intel(R) MID Audio Jack", SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1, &mfld_jack); if (ret_val) {
Fixes: 115f3f8 ("ASoC: mfld_machine: Convert to table based DAPM and control setup") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/intel/mfld_machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)