diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-12 10:43:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-13 06:02:43 -0400 |
commit | 0f9141c974b2dc29b7d1cf245bbf4685350521be (patch) | |
tree | 6927d4c08b90ec943964016eb80c3d56f8339a52 /sound | |
parent | 2b194f9db444875b4509e6dc92c949c57437c826 (diff) |
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, | |||
3051 | } | 3051 | } |
3052 | 3052 | ||
3053 | dai->dev = dev; | 3053 | dai->dev = dev; |
3054 | dai->id = i; | ||
3055 | dai->driver = &dai_drv[i]; | 3054 | dai->driver = &dai_drv[i]; |
3055 | if (dai->driver->id) | ||
3056 | dai->id = dai->driver->id; | ||
3057 | else | ||
3058 | dai->id = i; | ||
3056 | if (!dai->driver->ops) | 3059 | if (!dai->driver->ops) |
3057 | dai->driver->ops = &null_dai_ops; | 3060 | dai->driver->ops = &null_dai_ops; |
3058 | 3061 | ||