summaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-07-29 14:45:24 +0400
committerTakashi Iwai <tiwai@suse.de>2010-07-29 13:48:39 +0200
commitfa95a6471ffaa6f40d71f44fc4d4636ee17280f5 (patch)
treea712f44aba53420bff10b5f36fe6b20c2e8641e1 /sound/isa
parentec9d04b2a8f00b14a3df4714820cb2cda46dc4d6 (diff)
downloadlinux-stable-fa95a6471ffaa6f40d71f44fc4d4636ee17280f5.tar.gz
linux-stable-fa95a6471ffaa6f40d71f44fc4d4636ee17280f5.tar.bz2
linux-stable-fa95a6471ffaa6f40d71f44fc4d4636ee17280f5.zip
ALSA: msnd: check request_region() return value
request_region() may fail, if so return -EBUSY. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/msnd/msnd_pinnacle.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 60b6abd71612..5f3e68401f90 100644
--- 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;
}
- 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