Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 2b302bbffe7361c6faccc1eb84099f2e1c5b1baf..12522e6913d92d068676f4b3916571b03dae2d87 100644 (file)
--- a/sound/sound_core.c
+++ b/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;
 }