---

yaml --- r: 97055 b: refs/heads/master c: 5d99a8b h: refs/heads/master i: 97053: 076e3d3 97051: 5b3f946 97047: 6238bbb 97039: 34ed798 97023: 1f70e26 v: v3
git-mirror · May 20, 2008 · 47801ab · 47801ab
1 parent 34d76ac
commit 47801ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;
 }