From 12eebfd8ab5f68a5745cf7e452accf510af89710 Mon Sep 17 00:00:00 2001
From: Chuansheng Liu <chuansheng.liu@intel.com>
Date: Wed, 26 Dec 2012 00:57:32 +0800
Subject: [PATCH] --- yaml --- r: 348756 b: refs/heads/master c:
 d3bf1561253383a3dbcc40afdb2b039d56093a3e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f8a03b28960..8b74df7854e5 100644
--- 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
index f7551c1c827c..2370063b5824 100644
--- 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;
 	}