]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] cmipci: allow 96 kHz playback on non-multichannel rear
authorClemens Ladisch <clemens@ladisch.de>
Mon, 17 Sep 2007 07:37:47 +0000 (09:37 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Oct 2007 14:50:31 +0000 (16:50 +0200)
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>
sound/pci/cmipci.c

index c33c1c77869317149689b75c46595d5f35ddb19d..51ba704d4bc90f3fc9641d2a7222e41254a99ca7 100644 (file)
@@ -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;
 }