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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DB42C43381 for ; Fri, 15 Feb 2019 02:42:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EC0421A80 for ; Fri, 15 Feb 2019 02:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550198575; bh=mCLY9l9vTMsa1CECzFczBaVueKplL14xfsMm0i6+fQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v4PMk9Pa0Lc5lF+kvSdpqytzHTLAsvKSb8Y5yQDIdSYU3FU/AHYoDXy+/vTjRw52K wKLwG1M9zykUnuJXKJyhzLM62c0q82jlk9J0qyX5y23N1pIgPSOvaFG9zM/PiG+380 ZSZjUrHIwVbOI0uggw2xLG2d4FNSIVomYiT6D9Lo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727741AbfBOCml (ORCPT ); Thu, 14 Feb 2019 21:42:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:49400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731545AbfBOCJL (ORCPT ); Thu, 14 Feb 2019 21:09:11 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB6C5206BA; Fri, 15 Feb 2019 02:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196550; bh=mCLY9l9vTMsa1CECzFczBaVueKplL14xfsMm0i6+fQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3lr1m6DUplcduEP6ZtEc2tviItyHMzpjN9gf4WCcRX7vEGVQ9MMdxIqLdl/7cha9 3ouC52nmmoHF6FZRxKZ4iOltJJ+ondvr1mMMZ8In35u2Ao2uyXH79WmUAWJY3P6rtP vPoGwAZZibk5xjGFU6ic8oMhedulN2AhWkdHROxc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rohit kumar , Ajit Pandey , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.20 10/77] ASoC: soc-core: Hold client_mutex around soc_init_dai_link() Date: Thu, 14 Feb 2019 21:07:48 -0500 Message-Id: <20190215020855.176727-10-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215020855.176727-1-sashal@kernel.org> References: <20190215020855.176727-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rohit kumar [ Upstream commit 04eb1efcd614d6f067b76a355b3a3599667959dc ] soc_init_dai_link() calls soc_find_component() which needs to be within client_mutex lock. Add client_mutex lock around soc_init_dai_link() in snd_soc_register_card() to avoid lockdep warning. Fixes: 8780cf1142a5 ("ASoC: soc-core: defer card probe until all component is added to list") Reported-by: Kuninori Morimoto Signed-off-by: Rohit kumar Signed-off-by: Ajit Pandey Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 74b12f90ea9b..0b91d8fc6ca2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1027,6 +1027,7 @@ static int snd_soc_init_platform(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) { struct snd_soc_dai_link_component *platform = dai_link->platform; + /* * FIXME * @@ -2754,15 +2755,18 @@ int snd_soc_register_card(struct snd_soc_card *card) if (!card->name || !card->dev) return -EINVAL; + mutex_lock(&client_mutex); for_each_card_prelinks(card, i, link) { ret = soc_init_dai_link(card, link); if (ret) { dev_err(card->dev, "ASoC: failed to init link %s\n", link->name); + mutex_unlock(&client_mutex); return ret; } } + mutex_unlock(&client_mutex); dev_set_drvdata(card->dev, card); -- 2.19.1