From 99522c56c045c7274c6eef496b622dd8d2788cd2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 5 Jul 2011 09:25:59 +0200
Subject: [PATCH] --- yaml --- r: 254798 b: refs/heads/master c:
 873bd4cb4fbba6a3e99f750e17ef2ba6ef96e9d3 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e641b8192c4c..e1cda642e3e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9afa08fe831ae521bf11a125b347bb0b578526
+refs/heads/master: 873bd4cb4fbba6a3e99f750e17ef2ba6ef96e9d3
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index d75043ed7fc0..b194be09e74d 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1929,8 +1929,9 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 		 "%s", card->name);
 	snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
 		 "%s", card->long_name ? card->long_name : card->name);
-	snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),
-		 "%s", card->driver_name ? card->driver_name : card->name);
+	if (card->driver_name)
+		strlcpy(card->snd_card->driver, card->driver_name,
+			sizeof(card->snd_card->driver));
 
 	if (card->late_probe) {
 		ret = card->late_probe(card);