git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: msnd: check request_region() return value
[pandora-kernel.git]
/
sound
/
isa
/
msnd
/
msnd_pinnacle.c
diff --git
a/sound/isa/msnd/msnd_pinnacle.c
b/sound/isa/msnd/msnd_pinnacle.c
index
60b6abd
..
5f3e684
100644
(file)
--- a/
sound/isa/msnd/msnd_pinnacle.c
+++ b/
sound/isa/msnd/msnd_pinnacle.c
@@
-549,7
+549,10
@@
static int __devinit snd_msnd_attach(struct snd_card *card)
printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", chip->irq);
return err;
}
printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", chip->irq);
return err;
}
- request_region(chip->io, DSP_NUMIO, card->shortname);
+ if (request_region(chip->io, DSP_NUMIO, card->shortname) == NULL) {
+ free_irq(chip->irq, chip);
+ return -EBUSY;
+ }
if (!request_mem_region(chip->base, BUFFSIZE, card->shortname)) {
printk(KERN_ERR LOGNAME
if (!request_mem_region(chip->base, BUFFSIZE, card->shortname)) {
printk(KERN_ERR LOGNAME