diff --git a/[refs] b/[refs]
index 048eab9e245a..6f47cc06eaf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaa9b3a748539651f50e3a234c8854e1b42a839a
+refs/heads/master: 6321bd634eb755c87ca18c3b1ef348a213c1f597
diff --git a/trunk/sound/core/sound.c b/trunk/sound/core/sound.c
index 7872a02f6ca9..563d1967a0ad 100644
--- a/trunk/sound/core/sound.c
+++ b/trunk/sound/core/sound.c
@@ -468,5 +468,5 @@ static void __exit alsa_sound_exit(void)
 	unregister_chrdev(major, "alsa");
 }
 
-module_init(alsa_sound_init)
-module_exit(alsa_sound_exit)
+subsys_initcall(alsa_sound_init);
+module_exit(alsa_sound_exit);
diff --git a/trunk/sound/core/sound_oss.c b/trunk/sound/core/sound_oss.c
index 7fe12264ff80..0c164e5e4322 100644
--- a/trunk/sound/core/sound_oss.c
+++ b/trunk/sound/core/sound_oss.c
@@ -93,7 +93,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
 	default:
 		return -EINVAL;
 	}
-	if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OSS_MINORS))
+	if (minor < 0 || minor >= SNDRV_OSS_MINORS)
 		return -EINVAL;
 	return minor;
 }
diff --git a/trunk/sound/sound_core.c b/trunk/sound/sound_core.c
index dbca7c909a31..7c2d677a2df5 100644
--- a/trunk/sound/sound_core.c
+++ b/trunk/sound/sound_core.c
@@ -61,7 +61,7 @@ static void __exit cleanup_soundcore(void)
 	class_destroy(sound_class);
 }
 
-module_init(init_soundcore);
+subsys_initcall(init_soundcore);
 module_exit(cleanup_soundcore);