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 B6825C4332F for ; Wed, 30 Mar 2022 12:15:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345666AbiC3MOd (ORCPT ); Wed, 30 Mar 2022 08:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345953AbiC3LzP (ORCPT ); Wed, 30 Mar 2022 07:55:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4E532B277; Wed, 30 Mar 2022 04:53:23 -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 721DD615B7; Wed, 30 Mar 2022 11:53:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2475C36AE5; Wed, 30 Mar 2022 11:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641202; bh=jG8282IFcj0nXP570rbRy+T3hJ8cUA1zFu1Wj8etJZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fqs9iC0zvOoZBF5wWAzrNguEBIvs7aqG/BQIgNyWamv4+rf9TWS7gESZwvRYOcq8z cjVEBYOi4/UpiESvmaVd4v/rFJan08OBbVTbURY35Q8e5vn7Oq89MAAa3PXgdBl2ep oM4gZXz4G4z2gqLEl2Tn3JRzyw4UROJCOhGliW3IsABgsCW41cRRZkGvi5A8gLGcsn QXVrWhNe1k+vy+KC8azoSg4Msq+SH0UZ5jjiUykb8ThXh2W2OY+mLwg2ztBk5cN7zS LirL5wwS3o0nNtglRAMawHAIe0DpQVz7El9a3BbH5BfKP9b5YEcWi70xIxmrIWV2uq ffUk2o3r5wQTA== 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.19 12/22] ASoC: soc-core: skip zero num_dai component in searching dai name Date: Wed, 30 Mar 2022 07:52:53 -0400 Message-Id: <20220330115303.1672616-12-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115303.1672616-1-sashal@kernel.org> References: <20220330115303.1672616-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 273898b358c4..9ca7dff5593d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3708,7 +3708,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