diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-12 15:43:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-13 11:02:43 +0100 |
| commit | 0f9141c974b2dc29b7d1cf245bbf4685350521be (patch) | |
| tree | 6927d4c08b90ec943964016eb80c3d56f8339a52 /sound | |
| parent | 2b194f9db444875b4509e6dc92c949c57437c826 (diff) | |
| download | blackbird-op-linux-0f9141c974b2dc29b7d1cf245bbf4685350521be.tar.gz blackbird-op-linux-0f9141c974b2dc29b7d1cf245bbf4685350521be.zip | |
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, } 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; |
