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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 72381ECE58D for ; Wed, 9 Oct 2019 04:43:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDE7C206C0 for ; Wed, 9 Oct 2019 04:43:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="ZY8SLlAb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDE7C206C0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 29A8D167F; Wed, 9 Oct 2019 06:42:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 29A8D167F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1570596182; bh=8rprfirHoWWPVFkZnX4kWyB2EBBdgOcCJISgt01KXO4=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ZY8SLlAbbRGM5LtQg3zGYf2693U5+xBjZp6gW6/Wd7BsiFlXNtmCgO3kTppyzikMX tFI4ZjdImCmCL6wY1siqU+l4yRuXtgFPuGNWB64+5r6f5cen9BMMZA0cQ/bcC1k/xz jbRnTdXaAAbmSq8nvgeXyK64TBO2M0vLh5qiTrgU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 205C9F80759; Wed, 9 Oct 2019 06:31:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F0160F80765; Wed, 9 Oct 2019 06:31:15 +0200 (CEST) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa1.perex.cz (Postfix) with ESMTP id 62A7CF80759 for ; Wed, 9 Oct 2019 06:31:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 62A7CF80759 Date: 09 Oct 2019 13:31:10 +0900 X-IronPort-AV: E=Sophos;i="5.67,273,1566831600"; d="scan'208";a="28427716" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 09 Oct 2019 13:31:10 +0900 Received: from morimoto-PC.renesas.com (unknown [10.166.18.140]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id EB959417EAEA; Wed, 9 Oct 2019 13:31:10 +0900 (JST) Message-ID: <8736g2ilpt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> References: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Cc: Linux-ALSA , Pierre-Louis Bossart Subject: [alsa-devel] [PATCH 18/21] ASoC: soc-core: use mutex_lock() at snd_soc_add_component() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto snd_soc_component_add() is using mutex_lock(), but it should be used at snd_soc_add_component(). This patch tidyup it. This is prepare for snd_soc_register_dais() cleanup Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 5d96ffa..d4f80c8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2748,8 +2748,6 @@ EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap); static void snd_soc_component_add(struct snd_soc_component *component) { - mutex_lock(&client_mutex); - if (!component->driver->write && !component->driver->read) { if (!component->regmap) component->regmap = dev_get_regmap(component->dev, @@ -2760,8 +2758,6 @@ static void snd_soc_component_add(struct snd_soc_component *component) /* see for_each_component */ list_add(&component->list, &component_list); - - mutex_unlock(&client_mutex); } static void snd_soc_component_del(struct snd_soc_component *component) @@ -2835,9 +2831,11 @@ int snd_soc_add_component(struct device *dev, int ret; int i; + mutex_lock(&client_mutex); + ret = snd_soc_component_initialize(component, component_driver, dev); if (ret) - goto err_free; + goto err_del; if (component_driver->endianness) { for (i = 0; i < num_dai; i++) { @@ -2849,17 +2847,23 @@ int snd_soc_add_component(struct device *dev, ret = snd_soc_register_dais(component, dai_drv, num_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); - goto err_cleanup; + goto err_del; } snd_soc_component_add(component); - snd_soc_try_rebind_card(); - return 0; +err_del: + mutex_unlock(&client_mutex); + + /* + * these should be called without + * mutex_unlock(client_mutex) + */ + if (ret < 0) + snd_soc_del_component(component); + else + snd_soc_try_rebind_card(); -err_cleanup: - snd_soc_del_component(component); -err_free: return ret; } EXPORT_SYMBOL_GPL(snd_soc_add_component); -- 2.7.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel