aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2010-02-16 05:55:43 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 12:06:20 -0400
commit616b05819b8d31ecdbcbafa2794a0eb1ea5e6944 (patch)
tree98b2b04e77698291dc35e9b13436ba7ec3ef5726
parent4504b9999da5af251be123d69ddbf8f6f6c7a52d (diff)
ALSA: pcm core - fix fifo_size channels interval check
commit 3be522a9514f58e0596db34898a514df206cadc5 upstream. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--sound/core/pcm_native.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 25b0641e6b8c..f7e1c9f0d3ed 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -315,10 +315,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
315 if (!params->info) 315 if (!params->info)
316 params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; 316 params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
317 if (!params->fifo_size) { 317 if (!params->fifo_size) {
318 if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == 318 m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
319 snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && 319 i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
320 snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == 320 if (snd_mask_min(m) == snd_mask_max(m) &&
321 snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { 321 snd_interval_min(i) == snd_interval_max(i)) {
322 changed = substream->ops->ioctl(substream, 322 changed = substream->ops->ioctl(substream,
323 SNDRV_PCM_IOCTL1_FIFO_SIZE, params); 323 SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
324 if (changed < 0) 324 if (changed < 0)