]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: msnd: check request_region() return value
authorKulikov Vasiliy <segooon@gmail.com>
Thu, 29 Jul 2010 10:45:24 +0000 (14:45 +0400)
committerTakashi Iwai <tiwai@suse.de>
Thu, 29 Jul 2010 11:48:39 +0000 (13:48 +0200)
request_region() may fail, if so return -EBUSY.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/isa/msnd/msnd_pinnacle.c

index 60b6abd71612542e902f858955fb0a887fd19069..5f3e68401f905dbf2b8a03bc12fd657450b739d4 100644 (file)
@@ -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