diff options
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r-- | sound/pci/ca0106/ca0106.h | 1 | ||||
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index aaac6e5b4767..a0420bc63f0b 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h | |||
@@ -590,7 +590,6 @@ struct snd_ca0106 { | |||
590 | struct resource *res_port; | 590 | struct resource *res_port; |
591 | int irq; | 591 | int irq; |
592 | 592 | ||
593 | unsigned char revision; /* chip revision */ | ||
594 | unsigned int serial; /* serial number */ | 593 | unsigned int serial; /* serial number */ |
595 | unsigned short model; /* subsystem id */ | 594 | unsigned short model; /* subsystem id */ |
596 | 595 | ||
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 48f3f17c5170..9fd7b8a5b75e 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1293,13 +1293,12 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, | |||
1293 | } | 1293 | } |
1294 | 1294 | ||
1295 | pci_set_master(pci); | 1295 | pci_set_master(pci); |
1296 | /* read revision & serial */ | 1296 | /* read serial */ |
1297 | pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision); | ||
1298 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); | 1297 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); |
1299 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); | 1298 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); |
1300 | #if 1 | 1299 | #if 1 |
1301 | printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", chip->model, | 1300 | printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", chip->model, |
1302 | chip->revision, chip->serial); | 1301 | pci->revision, chip->serial); |
1303 | #endif | 1302 | #endif |
1304 | strcpy(card->driver, "CA0106"); | 1303 | strcpy(card->driver, "CA0106"); |
1305 | strcpy(card->shortname, "CA0106"); | 1304 | strcpy(card->shortname, "CA0106"); |