From 47801ab100b0a0e59de035ef220dd4d39c713c29 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 16 May 2008 17:55:12 -0700
Subject: [PATCH] --- yaml --- r: 97055 b: refs/heads/master c:
 5d99a8b814abd76e89ef2cf90e29bbb879d6d66c h: refs/heads/master i:   97053:
 076e3d38d24a30ede8faa63ce147b28b4a6fffb3   97051:
 5b3f946c8b070bb7435c113c58a45911631fd77a   97047:
 6238bbb8cf09444f374e54e2b16b08aa11b12d5a   97039:
 34ed7988858a05923e1f98ec69655584c42233cc   97023:
 1f70e26fed903fb059bea776373dd9c2e974ad8a v: v3

---
 [refs]                   | 2 +-
 trunk/sound/core/sound.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 97b4d6cd8962..9408f969b351 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43691da4cefcf0d0dd6432f9e7e0dba902b59597
+refs/heads/master: 5d99a8b814abd76e89ef2cf90e29bbb879d6d66c
diff --git a/trunk/sound/core/sound.c b/trunk/sound/core/sound.c
index 812f91b3de5b..6c8ab48c689a 100644
--- a/trunk/sound/core/sound.c
+++ b/trunk/sound/core/sound.c
@@ -259,8 +259,9 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
 		return minor;
 	}
 	snd_minors[minor] = preg;
-	preg->dev = device_create(sound_class, device, MKDEV(major, minor),
-				  "%s", name);
+	preg->dev = device_create_drvdata(sound_class, device,
+					  MKDEV(major, minor),
+					  private_data, "%s", name);
 	if (IS_ERR(preg->dev)) {
 		snd_minors[minor] = NULL;
 		mutex_unlock(&sound_mutex);
@@ -269,9 +270,6 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
 		return minor;
 	}
 
-	if (preg->dev)
-		dev_set_drvdata(preg->dev, private_data);
-
 	mutex_unlock(&sound_mutex);
 	return 0;
 }