diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/core/pcm_native.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
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 17935746eb18..872887624030 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -316,10 +316,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, | |||
| 316 | if (!params->info) | 316 | if (!params->info) |
| 317 | params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; | 317 | params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES; |
| 318 | if (!params->fifo_size) { | 318 | if (!params->fifo_size) { |
| 319 | if (snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) == | 319 | m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); |
| 320 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_FORMAT]) && | 320 | i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); |
| 321 | snd_mask_min(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) == | 321 | if (snd_mask_min(m) == snd_mask_max(m) && |
| 322 | snd_mask_max(¶ms->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) { | 322 | snd_interval_min(i) == snd_interval_max(i)) { |
| 323 | changed = substream->ops->ioctl(substream, | 323 | changed = substream->ops->ioctl(substream, |
| 324 | SNDRV_PCM_IOCTL1_FIFO_SIZE, params); | 324 | SNDRV_PCM_IOCTL1_FIFO_SIZE, params); |
| 325 | if (changed < 0) | 325 | if (changed < 0) |