Pull utrace into release branch

[karo-tx-linux.git] / sound / core / sound.c

diff --git a/sound/core/sound.c b/sound/core/sound.c
index c0685e2f0afa1fe39cab14cf86cb733cbaa761e7..44a69bb8d4f018e953cf0de692a9fb681a4a74b0 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -274,9 +274,8 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
                return minor;
        }
        snd_minors[minor] = preg;
-       preg->dev = device_create_drvdata(sound_class, device,
-                                         MKDEV(major, minor),
-                                         private_data, "%s", name);
+       preg->dev = device_create(sound_class, device, MKDEV(major, minor),
+                                 private_data, "%s", name);
        if (IS_ERR(preg->dev)) {
                snd_minors[minor] = NULL;
                mutex_unlock(&sound_mutex);