git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
pci
/
mixart
/
mixart.c
diff --git
a/sound/pci/mixart/mixart.c
b/sound/pci/mixart/mixart.c
index
09cc078
..
cc43ecd
100644
(file)
--- a/
sound/pci/mixart/mixart.c
+++ b/
sound/pci/mixart/mixart.c
@@
-61,7
+61,7
@@
MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");
/*
*/
/*
*/
-static struct pci_device_id snd_mixart_ids[]
__devinitdata
= {
+static struct pci_device_id snd_mixart_ids[] = {
{ 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */
{ 0, }
};
{ 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */
{ 0, }
};
@@
-1244,7
+1244,6
@@
static void __devinit snd_mixart_proc_init(struct snd_mixart *chip)
/* text interface to read perf and temp meters */
if (! snd_card_proc_new(chip->card, "board_info", &entry)) {
entry->private_data = chip;
/* text interface to read perf and temp meters */
if (! snd_card_proc_new(chip->card, "board_info", &entry)) {
entry->private_data = chip;
- entry->c.text.read_size = 1024;
entry->c.text.read = snd_mixart_proc_read;
}
entry->c.text.read = snd_mixart_proc_read;
}
@@
-1320,7
+1319,7
@@
static int __devinit snd_mixart_probe(struct pci_dev *pci,
pci_resource_len(pci, i));
}
pci_resource_len(pci, i));
}
- if (request_irq(pci->irq, snd_mixart_interrupt,
SA_INTERRUPT|SA_SHIRQ
, CARD_NAME, (void *)mgr)) {
+ if (request_irq(pci->irq, snd_mixart_interrupt,
IRQF_DISABLED|IRQF_SHARED
, CARD_NAME, (void *)mgr)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr);
return -EBUSY;
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr);
return -EBUSY;