ASoC: Pay attention to driver supplied DAI IDs

The driver can specify a DAI ID number so use that. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
git-mirror · Oct 13, 2010 · 0f9141c · 0f9141c
1 parent 2b194f9
commit 0f9141c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sound/soc/soc-core.c b/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;