---

yaml --- r: 348756 b: refs/heads/master c: d3bf156 h: refs/heads/master v: v3
git-mirror · Dec 27, 2012 · 12eebfd · 12eebfd
1 parent 2b29cc1
commit 12eebfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 865df9cb122d9e5ecbbb7056f2c9c64933bf8dd0
+refs/heads/master: d3bf1561253383a3dbcc40afdb2b039d56093a3e
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1556,7 +1556,7 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
 	/* unregister the rtd device */
 	if (rtd->dev_registered) {
 		device_remove_file(rtd->dev, &dev_attr_codec_reg);
-		device_del(rtd->dev);
+		device_unregister(rtd->dev);
 		rtd->dev_registered = 0;
 	}