From 62032b772e87c517c9bc8bf616e15a3a2fc1d2b1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Feb 2010 11:55:43 +0100 Subject: [PATCH] --- yaml --- r: 182620 b: refs/heads/master c: 3be522a9514f58e0596db34898a514df206cadc5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/pcm_native.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e2f234c56193..0ede92b8633d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f167e1d073278fe231bbdd5d6c24fb9d091aa544 +refs/heads/master: 3be522a9514f58e0596db34898a514df206cadc5 diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index 25b0641e6b8c..f7e1c9f0d3ed 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -315,10 +315,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, if (!params->info) params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; if (!params->fifo_size) { - if (snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == - snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && - snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == - snd_mask_max(¶ms->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)