[alsa-devel] [PATCH 2/2] ASoC: multi-component - Fix ".-1" removal from device name

Jarkko Nikula jhnikula at gmail.com
Tue Aug 3 08:26:58 CEST 2010


Function fmt_single_name returns empty name if device name is
"driver-name.-1".

Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
---
Liam. This is a trivial fix. No need for separate patch, just embed to your
next multi-component update. Do we even have a case where name is "foo-bar.-1"?
---
 sound/soc/soc-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 300a9b3..db7ea1b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2807,7 +2807,7 @@ static inline char *fmt_single_name(struct device *dev, int *id)
 
 			/* discard ID from name if ID == -1 */
 			if (*id == -1)
-				*found = '\0';
+				found[strlen(dev->driver->name)] = '\0';
 		}
 
 	} else {
-- 
1.7.1



More information about the Alsa-devel mailing list