diff --git a/[refs] b/[refs]
index 38eb65a95475..22647af18391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 808c569f3609b37642d1e08373e3de829b99d0f8
+refs/heads/master: 4dee8baa18d611b6dc854e1cc193550ff6f687be
diff --git a/trunk/sound/core/sound.c b/trunk/sound/core/sound.c
index 563d1967a0ad..7872a02f6ca9 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");
 }
 
-subsys_initcall(alsa_sound_init);
-module_exit(alsa_sound_exit);
+module_init(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 0c164e5e4322..7fe12264ff80 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 (minor < 0 || minor >= SNDRV_OSS_MINORS)
+	if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OSS_MINORS))
 		return -EINVAL;
 	return minor;
 }
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
index e3caa78ccd54..bff60cea7777 100644
--- a/trunk/sound/pci/hda/patch_realtek.c
+++ b/trunk/sound/pci/hda/patch_realtek.c
@@ -17251,7 +17251,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS),
 	SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",
 		      ALC662_3ST_6ch_DIG),
-	SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC663_ASUS_MODE4),
+	SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),
 	SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),
 	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",
 		      ALC662_3ST_6ch_DIG),
diff --git a/trunk/sound/sound_core.c b/trunk/sound/sound_core.c
index 7c2d677a2df5..dbca7c909a31 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);
 }
 
-subsys_initcall(init_soundcore);
+module_init(init_soundcore);
 module_exit(cleanup_soundcore);