>From 9aec0d21ae24e38b83060ffb0d031141c6683f1c Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 12 Oct 2010 22:13:06 +0100 Subject: [PATCH 1/2] ASoC: core - driver naming - FOR REBASE Add support for unique driver names and longnames TODO: add support for machines that dont specify longname or driver name. Signed-off-by: Liam Girdwood --- include/sound/soc.h | 1 + sound/soc/soc-core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index f6f39ab..bb3d3d9 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -606,6 +606,7 @@ struct snd_soc_dai_link { struct snd_soc_card { const char *name; const char *long_name; + const char *driver_name; struct device *dev; struct snd_card *snd_card; struct module *owner; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1cd4424..54cebff 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1773,7 +1773,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), "%s", card->long_name); snprintf(card->snd_card->driver, sizeof(card->snd_card->driver), - "%s", card->name); + "%s", card->driver_name); ret = snd_card_register(card->snd_card); if (ret < 0) { -- 1.7.1