From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D296C4332F for ; Wed, 30 Mar 2022 12:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344651AbiC3MRD (ORCPT ); Wed, 30 Mar 2022 08:17:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344725AbiC3L41 (ORCPT ); Wed, 30 Mar 2022 07:56:27 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FFEE31361; Wed, 30 Mar 2022 04:54:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A6BFAB81C28; Wed, 30 Mar 2022 11:54:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BCD7C36AE3; Wed, 30 Mar 2022 11:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641265; bh=i4LvtJMYs5t9UOhjaHJspxXRS2kYwM/x4i+LuKPkDHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H7nPFKqnZjaP+pXB88MVcs6hND4xYOwAoxj2S+LJpoaX9TNEGqv8XrLI58YQCqzt+ m8DD0zUj+a9d6yuZelMnH/bw4VO8BQGhzG7SMgrXBwuOOiZ/FBP39pHIrdMmj44qiZ hBMk9T+wwX+ZK50YfrC+30QBIm6kNT2V84+2ryCzTUJZe1CjioTTD68R8xL1rTvCdX XCD2b7hto+Eg2sxKAr6PYm2tDVUjGgsjrVagFGGjG9wYoYO0JjZ9XZQ0TVBwoO6Uba sP2YwgB/m4bixGZhQsEhqsODYlD+7f3uFeedwfaHJvDmZEdt3lpqqpiNXs+DOVW9PT 4B9wYjWekKzPg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shengjiu Wang , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.9 10/17] ASoC: soc-core: skip zero num_dai component in searching dai name Date: Wed, 30 Mar 2022 07:53:59 -0400 Message-Id: <20220330115407.1673214-10-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115407.1673214-1-sashal@kernel.org> References: <20220330115407.1673214-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shengjiu Wang [ Upstream commit f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea ] In the case like dmaengine which's not a dai but as a component, the num_dai is zero, dmaengine component has the same component_of_node as cpu dai, when cpu dai component is not ready, but dmaengine component is ready, try to get cpu dai name, the snd_soc_get_dai_name() return -EINVAL, not -EPROBE_DEFER, that cause below error: asoc-simple-card : parse error -22 asoc-simple-card: probe of failed with error -22 The sound card failed to probe. So this patch fixes the issue above by skipping the zero num_dai component in searching dai name. Signed-off-by: Shengjiu Wang Link: https://lore.kernel.org/r/1644491952-7457-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0344d4423167..81c3aa167038 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3799,7 +3799,7 @@ static int snd_soc_get_dai_name(struct of_phandle_args *args, if (!component_of_node && pos->dev->parent) component_of_node = pos->dev->parent->of_node; - if (component_of_node != args->np) + if (component_of_node != args->np || !pos->num_dai) continue; if (pos->driver->of_xlate_dai_name) { -- 2.34.1