From c936ac23fc543042f54eb6fd87624a8f4559945c Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 21 Mar 2013 03:27:13 -0700
Subject: [PATCH] --- yaml --- r: 371810 b: refs/heads/master c:
 a1422b8cb443c6cfc58da38394673b8b8eda6458 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8d28ea22be65..2e1bf17c8414 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995f297298f2337a5f9794271dc225d17cdb2c15
+refs/heads/master: a1422b8cb443c6cfc58da38394673b8b8eda6458
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 9e6118573fef..2ecaaf13e319 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -4169,7 +4169,15 @@ int snd_soc_register_component(struct device *dev,
 	cmpnt->driver	= cmpnt_drv;
 	cmpnt->num_dai	= num_dai;
 
-	ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+	/*
+	 * snd_soc_register_dai()  uses fmt_single_name(), and
+	 * snd_soc_register_dais() uses fmt_multiple_name()
+	 * for dai->name which is used for name based matching
+	 */
+	if (1 == num_dai)
+		ret = snd_soc_register_dai(dev, dai_drv);
+	else
+		ret = snd_soc_register_dais(dev, dai_drv, num_dai);
 	if (ret < 0) {
 		dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret);
 		goto error_component_name;