Merge "ASoC: msm: qdsp6v2: avoid same mixer control name with stream channel map" (ea534257) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/msm-qti-pp-config.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,7 @@ static const struct snd_kcontrol_new sec_auxpcm_lb_vol_mixer_controls[] = {
		};

		static const struct snd_kcontrol_new multi_ch_channel_map_mixer_controls[] = {
		SOC_SINGLE_MULTI_EXT("Playback Channel Map", SND_SOC_NOPM, 0, 16,
		SOC_SINGLE_MULTI_EXT("Playback Device Channel Map", SND_SOC_NOPM, 0, 16,
		0, 8, msm_qti_pp_get_channel_map_mixer,
		msm_qti_pp_put_channel_map_mixer),
		};