diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-08-27 09:21:02 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 15:59:29 +0200 |
| commit | b080ebbf92f8d98a048b100e0b0c4aa7e6354ab9 (patch) | |
| tree | ce18aee81f792148dce6b86b4001e69c322cb8a1 /sound/pci/cmipci.c | |
| parent | [ALSA] cmipci: reorganize chip version detection (diff) | |
| download | linux-b080ebbf92f8d98a048b100e0b0c4aa7e6354ab9.tar.xz linux-b080ebbf92f8d98a048b100e0b0c4aa7e6354ab9.zip | |
[ALSA] cmipci: remove has_dual_dac
Remove the has_dual_dac variable because it was always set.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/cmipci.c')
| -rw-r--r-- | 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 cc0977a8a3d6..42227012c0bd 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) |