Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b080ebbf92f8d98a048b100e0b0c4aa7e6354ab9
Commit:     b080ebbf92f8d98a048b100e0b0c4aa7e6354ab9
Parent:     133271fef52c06de52ea9a8ee27899f18dae9af2
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 27 09:21:02 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 15:59:29 2007 +0200

    [ALSA] cmipci: remove has_dual_dac
    
    Remove the has_dual_dac variable because it was always set.
    
    Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/cmipci.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index cc0977a..4222701 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -424,7 +424,6 @@ struct cmipci {
 
        int chip_version;
        int max_channels;
-       unsigned int has_dual_dac: 1;
        unsigned int can_ac3_sw: 1;
        unsigned int can_ac3_hw: 1;
        unsigned int can_multi_ch: 1;
@@ -2643,7 +2642,6 @@ static void __devinit query_chip(struct cmipci *cm)
                        break;
                }
                cm->max_channels = 2;
-               cm->has_dual_dac = 1;
        } else {
                if (detect & CM_CHIP_039) {
                        cm->chip_version = 39;
@@ -2659,7 +2657,6 @@ static void __devinit query_chip(struct cmipci *cm)
                        cm->max_channels = 6;
                }
                cm->can_ac3_hw = 1;
-               cm->has_dual_dac = 1;
                cm->can_multi_ch = 1;
        }
 }
@@ -2975,11 +2972,9 @@ static int __devinit snd_cmipci_create(struct snd_card 
*card, struct pci_dev *pc
        if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0)
                return err;
        pcm_index++;
-       if (cm->has_dual_dac) {
-               if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
-                       return err;
-               pcm_index++;
-       }
+       if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
+               return err;
+       pcm_index++;
        if (cm->can_ac3_hw || cm->can_ac3_sw) {
                pcm_spdif_index = pcm_index;
                if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 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