From: Matt Flax <flatmax@flatmax.org>
Date: Tue, 4 Apr 2017 09:20:59 +0000 (+1000)
Subject: Audioinjector : make the octo and pi sound cards have different driver names
X-Git-Tag: archive/raspbian/4.9.51-1+rpi1~5^2~311
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ce6ae13e7552a5538465945be002e54b5e04f49;p=linux-4.9.git

Audioinjector : make the octo and pi sound cards have different driver names

This patch gives the audioinjector octo and pi soundcards different driver
names. This allows both the be loaded without clashing.
---

diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c
index dcf403ab3763..49115c8e20ce 100644
--- a/sound/soc/bcm/audioinjector-octo-soundcard.c
+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
@@ -324,7 +324,7 @@ MODULE_DEVICE_TABLE(of, audioinjector_octo_of_match);
 
 static struct platform_driver audioinjector_octo_driver = {
 	.driver	= {
-		.name			= "audioinjector-audio",
+		.name			= "audioinjector-octo",
 		.owner			= THIS_MODULE,
 		.of_match_table = audioinjector_octo_of_match,
 	},
diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c
index ef54e0f07ea0..491906bbf446 100644
--- a/sound/soc/bcm/audioinjector-pi-soundcard.c
+++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
@@ -177,7 +177,7 @@ MODULE_DEVICE_TABLE(of, audioinjector_pi_soundcard_of_match);
 
 static struct platform_driver audioinjector_pi_soundcard_driver = {
        .driver         = {
-		.name   = "audioinjector-audio",
+		.name   = "audioinjector-stereo",
 		.owner  = THIS_MODULE,
 		.of_match_table = audioinjector_pi_soundcard_of_match,
        },