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
/
isa
/
es18xx.c
diff --git
a/sound/isa/es18xx.c
b/sound/isa/es18xx.c
index
e6945db
..
34998de
100644
(file)
--- a/
sound/isa/es18xx.c
+++ b/
sound/isa/es18xx.c
@@
-1837,7
+1837,7
@@
static int __devinit snd_es18xx_new_device(struct snd_card *card,
return -EBUSY;
}
return -EBUSY;
}
- if (request_irq(irq, snd_es18xx_interrupt,
SA_INTERRUPT
, "ES18xx", (void *) chip)) {
+ if (request_irq(irq, snd_es18xx_interrupt,
IRQF_DISABLED
, "ES18xx", (void *) chip)) {
snd_es18xx_free(chip);
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
return -EBUSY;
snd_es18xx_free(chip);
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
return -EBUSY;
@@
-2088,7
+2088,8
@@
static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard,
kfree(cfg);
return -EAGAIN;
}
kfree(cfg);
return -EAGAIN;
}
- snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));
+ snd_printdd("pnp: port=0x%llx\n",
+ (unsigned long long)pnp_port_start(acard->devc, 0));
/* PnP initialization */
pdev = acard->dev;
pnp_init_resource_table(cfg);
/* PnP initialization */
pdev = acard->dev;
pnp_init_resource_table(cfg);