Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus (c6859959) · Commits · 戴 / test

sound/soc/codecs/wm5110.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),

		ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
		ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
		@@ -976,6 +976,8 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
		if (ret != 0)
		return ret;

		arizona_init_spk(codec);

		snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");

		priv->core.arizona->dapm = &codec->dapm;