hifiberry: Make driver names unique in first 15 characters

See: LibreELEC PR1001
raspberrypi · Dec 1, 2016 · 9a254b3 · 9a254b3
1 parent 2b77cb6
commit 9a254b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/sound/soc/bcm/hifiberry_dac.c b/sound/soc/bcm/hifiberry_dac.c
@@ -63,6 +63,7 @@ static struct snd_soc_dai_link snd_rpi_hifiberry_dac_dai[] = {
 /* audio machine driver */
 static struct snd_soc_card snd_rpi_hifiberry_dac = {
 	.name         = "snd_rpi_hifiberry_dac",
+	.driver_name  = "HifiberryDac",
 	.owner        = THIS_MODULE,
 	.dai_link     = snd_rpi_hifiberry_dac_dai,
 	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dac_dai),

diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
@@ -291,6 +291,7 @@ static struct snd_soc_dai_link snd_rpi_hifiberry_dacplus_dai[] = {
 /* audio machine driver */
 static struct snd_soc_card snd_rpi_hifiberry_dacplus = {
 	.name         = "snd_rpi_hifiberry_dacplus",
+	.driver_name  = "HifiberryDacp",
 	.owner        = THIS_MODULE,
 	.dai_link     = snd_rpi_hifiberry_dacplus_dai,
 	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplus_dai),

diff --git a/sound/soc/bcm/hifiberry_digi.c b/sound/soc/bcm/hifiberry_digi.c
@@ -202,6 +202,7 @@ static struct snd_soc_dai_link snd_rpi_hifiberry_digi_dai[] = {
 /* audio machine driver */
 static struct snd_soc_card snd_rpi_hifiberry_digi = {
 	.name         = "snd_rpi_hifiberry_digi",
+	.driver_name  = "HifiberryDigi",
 	.owner        = THIS_MODULE,
 	.dai_link     = snd_rpi_hifiberry_digi_dai,
 	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_digi_dai),