diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-11-16 09:39:07 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@server.perex.cz> | 2006-12-20 02:55:55 -0500 |
commit | 01f681da496831eb3aff5a908cefdafe74dd263b (patch) | |
tree | e2b2aae6e7789139a63e5500774f0687788d53b7 /sound/pci/emu10k1 | |
parent | e3a5d59a17e9a42e3f3e0e37342b2679bab2ff43 (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/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index c46905a11175..e0724394ed25 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -235,7 +235,7 @@ struct emu10k1x { | |||
235 | struct resource *res_port; | 235 | struct resource *res_port; |
236 | int irq; | 236 | int irq; |
237 | 237 | ||
238 | unsigned int revision; /* chip revision */ | 238 | unsigned char revision; /* chip revision */ |
239 | unsigned int serial; /* serial number */ | 239 | unsigned int serial; /* serial number */ |
240 | unsigned short model; /* subsystem id */ | 240 | unsigned short model; /* subsystem id */ |
241 | 241 | ||
@@ -943,7 +943,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card, | |||
943 | 943 | ||
944 | pci_set_master(pci); | 944 | pci_set_master(pci); |
945 | /* read revision & serial */ | 945 | /* read revision & serial */ |
946 | pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision); | 946 | pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision); |
947 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); | 947 | pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); |
948 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); | 948 | pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); |
949 | snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, | 949 | snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, |