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 dcf403ab37639ba79e38278d7e4b1ade452c292a..49115c8e20ce1a2ba5a99feb8983a1cafb052ca2 100644 (file)
--- 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 ef54e0f07ea03f59e9957b5d98f3e7fdc998e469..491906bbf446826e55dd843f28e4860f48e908b8 100644 (file)
--- 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,
        },