diff --git a/[refs] b/[refs]
index cc29c2fdfcd7..221336a403fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa5ed63e96656bb246a9439e06c7b67d455a5aa1
+refs/heads/master: 7a9d56f6a459472bc4383aeb85612d72e79d1818
diff --git a/trunk/sound/sound_core.c b/trunk/sound/sound_core.c
index 2b302bbffe73..12522e6913d9 100644
--- a/trunk/sound/sound_core.c
+++ b/trunk/sound/sound_core.c
@@ -27,6 +27,11 @@ MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
 
+static char *sound_nodename(struct device *dev)
+{
+	return kasprintf(GFP_KERNEL, "snd/%s", dev_name(dev));
+}
+
 static int __init init_soundcore(void)
 {
 	int rc;
@@ -41,6 +46,8 @@ static int __init init_soundcore(void)
 		return PTR_ERR(sound_class);
 	}
 
+	sound_class->nodename = sound_nodename;
+
 	return 0;
 }