From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 12 Oct 2010 14:43:21 +0000 (+0100)
Subject: ASoC: Pay attention to driver supplied DAI IDs
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1226^2~344
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f9141c974b2dc29b7d1cf245bbf4685350521be;p=firefly-linux-kernel-4.4.55.git

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 6cee97e23da6..63c80e634a37 100644
--- 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;