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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
pci
/
ad1889.c
diff --git
a/sound/pci/ad1889.c
b/sound/pci/ad1889.c
index
0786d0e
..
98970d4
100644
(file)
--- a/
sound/pci/ad1889.c
+++ b/
sound/pci/ad1889.c
@@
-596,9
+596,7
@@
static struct snd_pcm_ops snd_ad1889_capture_ops = {
};
static irqreturn_t
};
static irqreturn_t
-snd_ad1889_interrupt(int irq,
- void *dev_id,
- struct pt_regs *regs)
+snd_ad1889_interrupt(int irq, void *dev_id)
{
unsigned long st;
struct snd_ad1889 *chip = dev_id;
{
unsigned long st;
struct snd_ad1889 *chip = dev_id;
@@
-860,7
+858,7
@@
snd_ad1889_free(struct snd_ad1889 *chip)
synchronize_irq(chip->irq);
if (chip->irq >= 0)
synchronize_irq(chip->irq);
if (chip->irq >= 0)
- free_irq(chip->irq,
(void*)
chip);
+ free_irq(chip->irq, chip);
skip_hw:
if (chip->iobase)
skip_hw:
if (chip->iobase)
@@
-947,7
+945,7
@@
snd_ad1889_create(struct snd_card *card,
spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
if (request_irq(pci->irq, snd_ad1889_interrupt,
spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
if (request_irq(pci->irq, snd_ad1889_interrupt,
- IRQF_
DISABLED|IRQF_SHARED, card->driver, (void*)
chip)) {
+ IRQF_
SHARED, card->driver,
chip)) {
printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
snd_ad1889_free(chip);
return -EBUSY;
printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
snd_ad1889_free(chip);
return -EBUSY;