diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2007-09-17 03:37:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 10:50:31 -0400 |
commit | 22a22f5aacdbb73ca605d34df76201a2df0fe8ac (patch) | |
tree | 8ddc7af3e4b4e599ba0a9550ba9de1bb9f5fe3b4 /sound/pci | |
parent | 4ee72717188767b127b22f7a582762b71d448408 (diff) |
[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/pci')
-rw-r--r-- | sound/pci/cmipci.c | 12 |
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) | |||
1623 | else if (cm->max_channels == 8) | 1623 | else if (cm->max_channels == 8) |
1624 | snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels_8); | 1624 | snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels_8); |
1625 | } | 1625 | } |
1626 | if (cm->chip_version == 68) { | ||
1627 | runtime->hw.rates |= SNDRV_PCM_RATE_88200 | | ||
1628 | SNDRV_PCM_RATE_96000; | ||
1629 | runtime->hw.rate_max = 96000; | ||
1630 | } | ||
1631 | snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000); | ||
1632 | } | 1626 | } |
1633 | mutex_unlock(&cm->open_mutex); | 1627 | mutex_unlock(&cm->open_mutex); |
1628 | if (cm->chip_version == 68) { | ||
1629 | runtime->hw.rates |= SNDRV_PCM_RATE_88200 | | ||
1630 | SNDRV_PCM_RATE_96000; | ||
1631 | runtime->hw.rate_max = 96000; | ||
1632 | } | ||
1633 | snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000); | ||
1634 | return 0; | 1634 | return 0; |
1635 | } | 1635 | } |
1636 | 1636 | ||