commit 3be522a9514f58e0596db34898a514df206cadc5
author Jaroslav Kysela <perex@perex.cz> Tue Feb 16 11:55:43 2010 +0100
committer Jaroslav Kysela <perex@perex.cz> Tue Feb 16 12:00:20 2010 +0100
tree 91d2da01dae4d134c6af83ce6e7b71348d6055d2
parent f167e1d073278fe231bbdd5d6c24fb9d091aa544

ALSA: pcm core - fix fifo_size channels interval check

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: <stable@kernel.org>

sound/core/pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 25b0641..f7e1c9f 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -315,10 +315,10 @@
 	if (!params->info)
 		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
 	if (!params->fifo_size) {
-		if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) ==
-		    snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) &&
-                    snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) ==
-                    snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {
+		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+		if (snd_mask_min(m) == snd_mask_max(m) &&
+                    snd_interval_min(i) == snd_interval_max(i)) {
 			changed = substream->ops->ioctl(substream,
 					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
 			if (changed < 0)