aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/cmipci.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index cc0977a8a3d6..42227012c0bd 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -424,7 +424,6 @@ struct cmipci {
424 424
425 int chip_version; 425 int chip_version;
426 int max_channels; 426 int max_channels;
427 unsigned int has_dual_dac: 1;
428 unsigned int can_ac3_sw: 1; 427 unsigned int can_ac3_sw: 1;
429 unsigned int can_ac3_hw: 1; 428 unsigned int can_ac3_hw: 1;
430 unsigned int can_multi_ch: 1; 429 unsigned int can_multi_ch: 1;
@@ -2643,7 +2642,6 @@ static void __devinit query_chip(struct cmipci *cm)
2643 break; 2642 break;
2644 } 2643 }
2645 cm->max_channels = 2; 2644 cm->max_channels = 2;
2646 cm->has_dual_dac = 1;
2647 } else { 2645 } else {
2648 if (detect & CM_CHIP_039) { 2646 if (detect & CM_CHIP_039) {
2649 cm->chip_version = 39; 2647 cm->chip_version = 39;
@@ -2659,7 +2657,6 @@ static void __devinit query_chip(struct cmipci *cm)
2659 cm->max_channels = 6; 2657 cm->max_channels = 6;
2660 } 2658 }
2661 cm->can_ac3_hw = 1; 2659 cm->can_ac3_hw = 1;
2662 cm->has_dual_dac = 1;
2663 cm->can_multi_ch = 1; 2660 cm->can_multi_ch = 1;
2664 } 2661 }
2665} 2662}
@@ -2975,11 +2972,9 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
2975 if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0) 2972 if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0)
2976 return err; 2973 return err;
2977 pcm_index++; 2974 pcm_index++;
2978 if (cm->has_dual_dac) { 2975 if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
2979 if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0) 2976 return err;
2980 return err; 2977 pcm_index++;
2981 pcm_index++;
2982 }
2983 if (cm->can_ac3_hw || cm->can_ac3_sw) { 2978 if (cm->can_ac3_hw || cm->can_ac3_sw) {
2984 pcm_spdif_index = pcm_index; 2979 pcm_spdif_index = pcm_index;
2985 if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0) 2980 if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0)