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 4ABD6C43217 for ; Wed, 30 Mar 2022 12:17:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346982AbiC3MSv (ORCPT ); Wed, 30 Mar 2022 08:18:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344391AbiC3Lzx (ORCPT ); Wed, 30 Mar 2022 07:55:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0765E2BB01; Wed, 30 Mar 2022 04:53:55 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 0C74A6170E; Wed, 30 Mar 2022 11:53:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86AFDC36AE2; Wed, 30 Mar 2022 11:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641234; bh=KILYHveAm1KA+QDA4KsMbD9x4kEXUusNdRBZBi+Vj3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=trfeWur3KHESINxAuLYW5iIN8PxgStCMYc0E1DvA4moJFAogFitSw/yiZd37CvMj6 bI3Z2Wa5lj22BKQdlTXYCwKAxuq8FQ6+LFxkFgjvBb0F0XC/41IxkjZCmRqjhx5mQw 5RT8W4+PD6fQimoHP6Lt2hvCDO3MtSsgccYFcA7UlQQmpIpjpohoYAKQLOZwnRuJa8 JTgu0/Q0DoMHI4WAr17D8NRYb6mRbvKkt6YbvH2p8QHUQ9/g/vbrThlNMAzxZHr6j/ GCC/104HtXnfekQ3zcHsa7SGiPOkIDRgXuNzuEXrIxLTtKYRjvgqswPxh7CrIJ6hdy EQhPyFEuPFunQ== 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.14 11/20] ASoC: soc-core: skip zero num_dai component in searching dai name Date: Wed, 30 Mar 2022 07:53:27 -0400 Message-Id: <20220330115336.1672930-11-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115336.1672930-1-sashal@kernel.org> References: <20220330115336.1672930-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 2a172de37466..febf2b649b96 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4243,7 +4243,7 @@ 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