Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

2016-02-10 19:23:02 +00:00
parent 2022d24e2b 38c079e230
commit 7ff60f58e2
6 changed files with 61 additions and 29 deletions
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@ -212,7 +212,10 @@ static int skylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
 {
 	struct snd_interval *channels = hw_param_interval(params,
 						SNDRV_PCM_HW_PARAM_CHANNELS);
-	channels->min = channels->max = 4;
+	if (params_channels(params) == 2)
+		channels->min = channels->max = 2;
+	else
+		channels->min = channels->max = 4;

 	return 0;
 }