2010-07-28 16:40:52

by Kulikov Vasiliy

[permalink] [raw]
Subject: [PATCH 06/10] ALSA: msnd: check request_region() return value

request_region() may fail, if so return -ENOMEM.

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
sound/isa/msnd/msnd_pinnacle.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 60b6abd..ed42f8e 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 -ENOMEM;
+ }

if (!request_mem_region(chip->base, BUFFSIZE, card->shortname)) {
printk(KERN_ERR LOGNAME
--
1.7.0.4