summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2007-09-17 11:37:47 +0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 18:50:31 +0400
commit22a22f5aacdbb73ca605d34df76201a2df0fe8ac (patch)
tree8ddc7af3e4b4e599ba0a9550ba9de1bb9f5fe3b4 /sound
parent4ee72717188767b127b22f7a582762b71d448408 (diff)
downloadlinux-22a22f5aacdbb73ca605d34df76201a2df0fe8ac.tar.xz
[ALSA] cmipci: allow 96 kHz playback on non-multichannel rear
Move the code that enables 96 kHz out of the if() that checks for availability of both DMA channels so that it is enabled even when another stream is playing on the front channels. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/cmipci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index c33c1c778693..51ba704d4bc9 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -1623,14 +1623,14 @@ static int snd_cmipci_playback2_open(struct snd_pcm_substream *substream)
else if (cm->max_channels == 8)
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels_8);
}
- if (cm->chip_version == 68) {
- runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
- SNDRV_PCM_RATE_96000;
- runtime->hw.rate_max = 96000;
- }
- snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
}
mutex_unlock(&cm->open_mutex);
+ if (cm->chip_version == 68) {
+ runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+ SNDRV_PCM_RATE_96000;
+ runtime->hw.rate_max = 96000;
+ }
+ snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
return 0;
}