---

yaml --- r: 216635 b: refs/heads/master c: 0f9141c h: refs/heads/master i: 216633: 23835f0 216631: 54d85ed v: v3
git-mirror · Oct 13, 2010 · e5b2338 · e5b2338
1 parent 917ce25
commit e5b2338
Show file tree

Hide file tree

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