Jelajahi Sumber

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>
Mark Brown 14 tahun lalu
induk
melakukan
0f9141c974
1 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 4 1
      sound/soc/soc-core.c

+ 4 - 1
sound/soc/soc-core.c

@@ -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;