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>
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6cee97e..63c80e6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3051,8 +3051,11 @@
}
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;