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
/
intel8x0m.c
diff --git
a/sound/pci/intel8x0m.c
b/sound/pci/intel8x0m.c
index
9185028
..
47e26aa
100644
(file)
--- a/
sound/pci/intel8x0m.c
+++ b/
sound/pci/intel8x0m.c
@@
-59,7
+59,7
@@
MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"
static int index = -2; /* Exclude the first card */
static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
static int index = -2; /* Exclude the first card */
static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
-static int ac97_clock;
+static int ac97_clock
= 0
;
module_param(index, int, 0444);
MODULE_PARM_DESC(index, "Index value for Intel i8x0 modemcard.");
module_param(index, int, 0444);
MODULE_PARM_DESC(index, "Index value for Intel i8x0 modemcard.");
@@
-1092,7
+1092,7
@@
static void __devinit snd_intel8x0m_proc_init(struct intel8x0m * chip)
struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "intel8x0m", &entry))
struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "intel8x0m", &entry))
- snd_info_set_text_ops(entry, chip, snd_intel8x0m_proc_read);
+ snd_info_set_text_ops(entry, chip,
1024,
snd_intel8x0m_proc_read);
}
#else /* !CONFIG_PROC_FS */
#define snd_intel8x0m_proc_init(chip)
}
#else /* !CONFIG_PROC_FS */
#define snd_intel8x0m_proc_init(chip)
@@
-1185,7
+1185,7
@@
static int __devinit snd_intel8x0m_create(struct snd_card *card,
}
port_inited:
}
port_inited:
- if (request_irq(pci->irq, snd_intel8x0_interrupt,
IRQF_DISABLED|IRQF_SHARED
,
+ if (request_irq(pci->irq, snd_intel8x0_interrupt,
SA_INTERRUPT|SA_SHIRQ
,
card->shortname, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0_free(chip);
card->shortname, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_intel8x0_free(chip);