X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=sound%2Fsound_core.c;h=20d4e2e1bacf131906832d13bb856caf94cb583c;hb=6629de98a6d67e8ee6bbb6290168fb556940fdb0;hp=11e953a1fa45a06ab9243eca4d99d5b3f16ea9ef;hpb=60e53a6701ca55b3399275d805d223834819d9ce;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 11e953a1fa45..20d4e2e1bacf 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -287,7 +287,8 @@ retry:
 				goto retry;
 			}
 			spin_unlock(&sound_loader_lock);
-			return -EBUSY;
+			r = -EBUSY;
+			goto fail;
 		}
 	}
 
@@ -655,7 +656,7 @@ static void cleanup_oss_soundcore(void)
 static int __init init_oss_soundcore(void)
 {
 	if (preclaim_oss &&
-	    register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops) == -1) {
+	    register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops) < 0) {
 		printk(KERN_ERR "soundcore: sound device already in use.\n");
 		return -EBUSY;
 	}