diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 14:38:39 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 14:38:39 +0300 |
commit | a86ba28583987b85845ed61be5f12aafb5fc4971 (patch) | |
tree | de3fd39d3921ade6fd1a42508841483f1f25c82d /sound/core/pcm_native.c | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
download | linux-a86ba28583987b85845ed61be5f12aafb5fc4971.tar.xz |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r-- | sound/core/pcm_native.c | 8 |
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, 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) |