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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
pci
/
fm801.c
diff --git
a/sound/pci/fm801.c
b/sound/pci/fm801.c
index
13868c9
..
712ba72
100644
(file)
--- a/
sound/pci/fm801.c
+++ b/
sound/pci/fm801.c
@@
-56,7
+56,7
@@
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card *
* 3 = MediaForte 64-PCR
* High 16-bits are video (radio) device number + 1
*/
* 3 = MediaForte 64-PCR
* High 16-bits are video (radio) device number + 1
*/
-static int tea575x_tuner[SNDRV_CARDS];
+static int tea575x_tuner[SNDRV_CARDS]
= { [0 ... (SNDRV_CARDS-1)] = 0 }
;
module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for the FM801 soundcard.");
module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for the FM801 soundcard.");
@@
-1371,7
+1371,7
@@
static int __devinit snd_fm801_create(struct snd_card *card,
return err;
}
chip->port = pci_resource_start(pci, 0);
return err;
}
chip->port = pci_resource_start(pci, 0);
- if (request_irq(pci->irq, snd_fm801_interrupt,
IRQF_DISABLED|IRQF_SHARED
,
+ if (request_irq(pci->irq, snd_fm801_interrupt,
SA_INTERRUPT|SA_SHIRQ
,
"FM801", chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
snd_fm801_free(chip);
"FM801", chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
snd_fm801_free(chip);
@@
-1448,8
+1448,7
@@
static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
return err;
}
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
return err;
}
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
- FM801_REG(chip, MPU401_DATA),
- MPU401_INFO_INTEGRATED,
+ FM801_REG(chip, MPU401_DATA), 1,
chip->irq, 0, &chip->rmidi)) < 0) {
snd_card_free(card);
return err;
chip->irq, 0, &chip->rmidi)) < 0) {
snd_card_free(card);
return err;