diff options
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 4 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index dbc805c33fc4..4a9b59ad8ab1 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -1511,7 +1511,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1511 | struct snd_emu10k1 *emu; | 1511 | struct snd_emu10k1 *emu; |
1512 | int idx, err; | 1512 | int idx, err; |
1513 | int is_audigy; | 1513 | int is_audigy; |
1514 | unsigned char revision; | ||
1515 | unsigned int silent_page; | 1514 | unsigned int silent_page; |
1516 | const struct snd_emu_chip_details *c; | 1515 | const struct snd_emu_chip_details *c; |
1517 | static struct snd_device_ops ops = { | 1516 | static struct snd_device_ops ops = { |
@@ -1543,8 +1542,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1543 | emu->synth = NULL; | 1542 | emu->synth = NULL; |
1544 | emu->get_synth_voice = NULL; | 1543 | emu->get_synth_voice = NULL; |
1545 | /* read revision & serial */ | 1544 | /* read revision & serial */ |
1546 | pci_read_config_byte(pci, PCI_REVISION_ID, &revision); | 1545 | emu->revision = pci->revision; |
1547 | emu->revision = revision; | ||
1548 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial); | 1546 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial); |
1549 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model); | 1547 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model); |
1550 | snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model); | 1548 | snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model); |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index bb0fec7f7e1b..e4af7a9b808c 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -942,7 +942,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card, | |||
942 | 942 | ||
943 | pci_set_master(pci); | 943 | pci_set_master(pci); |
944 | /* read revision & serial */ | 944 | /* read revision & serial */ |
945 | pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision); | 945 | chip->revision = pci->revision; |
946 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); | 946 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); |
947 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); | 947 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); |
948 | snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, | 948 | snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, |