From 34dcadacd7eb79a056a7506a854f1d4e15c67212 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Tue, 4 Apr 2017 19:20:59 +1000 Subject: [PATCH] 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. --- sound/soc/bcm/audioinjector-octo-soundcard.c | 2 +- sound/soc/bcm/audioinjector-pi-soundcard.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c index dcf403ab37639b..49115c8e20ce1a 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 ef54e0f07ea03f..491906bbf44682 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, },