X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound%2Fisa%2Fmsnd%2Fmsnd_pinnacle.c;fp=sound%2Fisa%2Fmsnd%2Fmsnd_pinnacle.c;h=5f3e68401f905dbf2b8a03bc12fd657450b739d4;hb=fa95a6471ffaa6f40d71f44fc4d4636ee17280f5;hp=60b6abd71612542e902f858955fb0a887fd19069;hpb=ec9d04b2a8f00b14a3df4714820cb2cda46dc4d6;p=pandora-kernel.git

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