Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=22a22f5aacdbb73ca605d34df76201a2df0fe8ac
Commit:     22a22f5aacdbb73ca605d34df76201a2df0fe8ac
Parent:     4ee72717188767b127b22f7a582762b71d448408
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 17 09:37:47 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 16:50:31 2007 +0200

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 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 c33c1c7..51ba704 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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to