From e5b2338b35b06f664b512cb43c812c9637ecdb1c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 12 Oct 2010 15:43:21 +0100
Subject: [PATCH] --- yaml --- r: 216635 b: refs/heads/master c:
 0f9141c974b2dc29b7d1cf245bbf4685350521be h: refs/heads/master i:   216633:
 23835f0da42abed6faefae084c446743a6697d2b   216631:
 54d85ed67132af181caf1335117dec1b71841f1d v: v3

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

diff --git a/[refs] b/[refs]
index 11c32f91cbce..92d5c3cfac84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b194f9db444875b4509e6dc92c949c57437c826
+refs/heads/master: 0f9141c974b2dc29b7d1cf245bbf4685350521be
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 6cee97e23da6..63c80e634a37 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -3051,8 +3051,11 @@ int snd_soc_register_dais(struct device *dev,
 		}
 
 		dai->dev = dev;
-		dai->id = i;
 		dai->driver = &dai_drv[i];
+		if (dai->driver->id)
+			dai->id = dai->driver->id;
+		else
+			dai->id = i;
 		if (!dai->driver->ops)
 			dai->driver->ops = &null_dai_ops;