aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-11-16 09:39:07 -0500
committerJaroslav Kysela <perex@server.perex.cz>2006-12-20 02:55:55 -0500
commit01f681da496831eb3aff5a908cefdafe74dd263b (patch)
treee2b2aae6e7789139a63e5500774f0687788d53b7 /sound/pci/ca0106
parente3a5d59a17e9a42e3f3e0e37342b2679bab2ff43 (diff)
[ALSA] Fix invalid assignment of PCI revision
Fix the type of PCI revision to char from int and avoid invalid assignment with pointer cast. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106.h2
-rw-r--r--sound/pci/ca0106/ca0106_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 9cb66c59f523..aaac6e5b4767 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -590,7 +590,7 @@ struct snd_ca0106 {
590 struct resource *res_port; 590 struct resource *res_port;
591 int irq; 591 int irq;
592 592
593 unsigned int revision; /* chip revision */ 593 unsigned char revision; /* chip revision */
594 unsigned int serial; /* serial number */ 594 unsigned int serial; /* serial number */
595 unsigned short model; /* subsystem id */ 595 unsigned short model; /* subsystem id */
596 596
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6fa4a302f7de..2adbd003851d 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1283,7 +1283,7 @@ static int __devinit snd_ca0106_create(struct snd_card *card,
1283 1283
1284 pci_set_master(pci); 1284 pci_set_master(pci);
1285 /* read revision & serial */ 1285 /* read revision & serial */
1286 pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision); 1286 pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
1287 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); 1287 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
1288 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); 1288 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
1289#if 1 1289#if 1