Commit 0f9141c9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Pay attention to driver supplied DAI IDs 



The driver can specify a DAI ID number so use that.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 2b194f9d

sound/soc/soc-core.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -3051,8 +3051,11 @@ int snd_soc_register_dais(struct device *dev, 
		}

		}





		dai->dev = dev;

		dai->dev = dev;

		dai->id = i;

		dai->driver = &dai_drv[i];

		dai->driver = &dai_drv[i];

		if (dai->driver->id)

			dai->id = dai->driver->id;

		else

			dai->id = i;

		if (!dai->driver->ops)

		if (!dai->driver->ops)

			dai->driver->ops = &null_dai_ops;

			dai->driver->ops = &null_dai_ops;