sound: oss: msnd: check request_region() return value

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

Signed-off-by: Kulikov Vasiliy <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index bfaac5fa13d7ad9f6d1b2ad69d412361f5f875c5..2e48b17667d0f661671dfdfd0a3f30bd7b641b95 100644 (file)
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -1400,9 +1400,13 @@ static int __init attach_multisound(void)
                printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", dev.irq);
                return err;
        }
-       request_region(dev.io, dev.numio, dev.name);
+       if (request_region(dev.io, dev.numio, dev.name) == NULL) {
+               free_irq(dev.irq, &dev);
+               return -EBUSY;
+       }
 
-        if ((err = dsp_full_reset()) < 0) {
+       err = dsp_full_reset();
+       if (err < 0) {
                release_region(dev.io, dev.numio);
                free_irq(dev.irq, &dev);
                return err;