From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Subject: [PATCH] ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() Date: Mon, 18 Mar 2013 17:36:43 -0700 (PDT) Message-ID: <87txo8fco8.wl%kuninori.morimoto.gx@renesas.com> References: <87txo96xiu.wl%kuninori.morimoto.gx@renesas.com> <51473657.5000104@metafoo.de> <87vc8ofcuo.wl%kuninori.morimoto.gx@renesas.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by alsa0.perex.cz (Postfix) with ESMTP id 9BD42265CA9 for ; Tue, 19 Mar 2013 01:36:45 +0100 (CET) Received: by mail-pd0-f169.google.com with SMTP id 3so997720pdj.28 for ; Mon, 18 Mar 2013 17:36:44 -0700 (PDT) In-Reply-To: <87vc8ofcuo.wl%kuninori.morimoto.gx@renesas.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Lars-Peter Clausen , Mark Brown , Stephen Warren , Liam Girdwood Cc: Linux-ALSA , Simon , Kuninori Morimoto List-Id: alsa-devel@alsa-project.org 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. This patch uses properly snd_soc_register_dai() it it was single driver, and uses snd_register_dais() if it were multiple drivers. Signed-off-by: Kuninori Morimoto --- If this patch was OK, I will re-send "switch over" patch set sound/soc/soc-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 27ae7ee..f6cda7b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4165,7 +4165,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; -- 1.7.9.5