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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
sound
/
pci
/
riptide
/
riptide.c
diff --git
a/sound/pci/riptide/riptide.c
b/sound/pci/riptide/riptide.c
index
f435fcd
..
d8cc985
100644
(file)
--- a/
sound/pci/riptide/riptide.c
+++ b/
sound/pci/riptide/riptide.c
@@
-506,7
+506,7
@@
static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip);
/*
*/
/*
*/
-static struct pci_device_id snd_riptide_ids[] = {
+static struct pci_device_id snd_riptide_ids[]
__devinitdata
= {
{
.vendor = 0x127a,.device = 0x4310,
.subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID,
{
.vendor = 0x127a,.device = 0x4310,
.subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID,
@@
-1836,11
+1836,11
@@
static int snd_riptide_free(struct snd_riptide *chip)
UNSET_GRESET(cif->hwport);
kfree(chip->cif);
}
UNSET_GRESET(cif->hwport);
kfree(chip->cif);
}
- if (chip->irq >= 0)
- free_irq(chip->irq, chip);
if (chip->fw_entry)
release_firmware(chip->fw_entry);
release_and_free_resource(chip->res_port);
if (chip->fw_entry)
release_firmware(chip->fw_entry);
release_and_free_resource(chip->res_port);
+ if (chip->irq >= 0)
+ free_irq(chip->irq, chip);
kfree(chip);
return 0;
}
kfree(chip);
return 0;
}
@@
-1892,7
+1892,7
@@
snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
UNSET_AIE(hwport);
if (request_irq
UNSET_AIE(hwport);
if (request_irq
- (pci->irq, snd_riptide_interrupt,
IRQF_DISABLED | IRQF_SHARED
,
+ (pci->irq, snd_riptide_interrupt,
SA_INTERRUPT | SA_SHIRQ
,
"RIPTIDE", chip)) {
snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
pci->irq);
"RIPTIDE", chip)) {
snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
pci->irq);
@@
-1992,7
+1992,7
@@
static void __devinit snd_riptide_proc_init(struct snd_riptide *chip)
struct snd_info_entry *entry;
if (!snd_card_proc_new(chip->card, "riptide", &entry))
struct snd_info_entry *entry;
if (!snd_card_proc_new(chip->card, "riptide", &entry))
- snd_info_set_text_ops(entry, chip, snd_riptide_proc_read);
+ snd_info_set_text_ops(entry, chip,
4096,
snd_riptide_proc_read);
}
static int __devinit snd_riptide_mixer(struct snd_riptide *chip)
}
static int __devinit snd_riptide_mixer(struct snd_riptide *chip)