From 260495266a91184a1fcfa808d045d14670b72b1d Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Thu, 29 Jul 2010 14:45:50 +0400
Subject: [PATCH] --- yaml --- r: 206697 b: refs/heads/master c:
 9c29490246ed80975ab8b87bcd4ebe5b87c1c1d6 h: refs/heads/master i:   206695:
 b96bb6529471c250c32459afe4c6b067b54d8f9f v: v3

---
 [refs]                          | 2 +-
 trunk/sound/oss/msnd_pinnacle.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1d9a7dc2f493..6ca20948bd17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa95a6471ffaa6f40d71f44fc4d4636ee17280f5
+refs/heads/master: 9c29490246ed80975ab8b87bcd4ebe5b87c1c1d6
diff --git a/trunk/sound/oss/msnd_pinnacle.c b/trunk/sound/oss/msnd_pinnacle.c
index bfaac5fa13d7..2e48b17667d0 100644
--- a/trunk/sound/oss/msnd_pinnacle.c
+++ b/trunk/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;