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 5B4EDEB64D9 for ; Thu, 6 Jul 2023 11:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232555AbjGFLJb (ORCPT ); Thu, 6 Jul 2023 07:09:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232321AbjGFLJ3 (ORCPT ); Thu, 6 Jul 2023 07:09:29 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA16419BD for ; Thu, 6 Jul 2023 04:09:26 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fbef8ad9bbso6129785e9.0 for ; Thu, 06 Jul 2023 04:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688641765; x=1691233765; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=SIj2+V/VP+rgVGq4LUz1e1rdLRL5BqfXPBlJe4PqQsE=; b=lxONzCc9GC2outRmWa/EOhxdck5SL78H2jfexfxWjCqrm2QLmknOD5DhCcyMWw6wUD I1FlH1MVrEHDXop3j1JN7FY+8aInmf6LKyKXZquDCsf/c7VxrTWKpiwBBBfs6dLriV24 RJ9h5m480xzKKl5mFj5mNEATU2iAuhY2I6ta0p/lw+izTgBdjhSeBn5s9Lbj4ZoW+3R8 FLgE6t0QjiwpML+oIckfIipPp2VhZkASCL6lkrO5Z9kMXQ12UXt600YTcGSQ+klrY1vD GQVsRVY3eyr4YinuOeR9w3S8kwXfuvHFo7lhUepMq21nJaIS0QTJlWVm0oXxVyaaqKZV rx1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688641765; x=1691233765; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SIj2+V/VP+rgVGq4LUz1e1rdLRL5BqfXPBlJe4PqQsE=; b=GbeGPDfJbJbfO4C4FxmVIBvNPHscXPwUaJBUlKtNXYhhfTXcMXbcHZHXwuGSz23Uq9 R7BhhVp8d0kj9Y3DJrMFuN3YrFE9CcVAsR88wzutI32YHgrVmOwIuXNu6rwStmOWZWoI l18JzSbf/Lpvd2HmjdLzCu+KNCezLfzvZeIPfbREs+caI07guRb5sDNOqeCrsWwtckFp afQ1cFPGT9hSJan+Bhalp1kfL2Ku2FZp8moneRMHwdBZCihoTs4WdfrB8kRxcY0w7k/p eMglspr6Nn2/g8Hj7trJoIL5zrjEoem4414tn8om/VHzdGE7QAx/f2kKL0NYZXRWMcb6 TOtQ== X-Gm-Message-State: ABy/qLaPbo6T5YOET08mKXsvMIYkpDpvCn1kuC3Tfd/9PxSCftZ1oRqK krdtYZu7j+DWdgDODhwMt4XLew== X-Google-Smtp-Source: APBJJlFSGX0LHufU9KQEKqywttxIC7qHfy+cWCgwrlBohKCOWuJl+aRWReGGpm/SpGwpGySf6Sv8bQ== X-Received: by 2002:a05:600c:2901:b0:3fb:d194:8332 with SMTP id i1-20020a05600c290100b003fbd1948332mr1115891wmd.30.1688641765441; Thu, 06 Jul 2023 04:09:25 -0700 (PDT) Received: from [192.168.1.195] ([5.133.47.210]) by smtp.googlemail.com with ESMTPSA id l25-20020a7bc459000000b003fbe0da2a06sm1780017wmi.28.2023.07.06.04.09.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Jul 2023 04:09:24 -0700 (PDT) Message-ID: <691cdd52-4265-da42-04c1-8a5b533e2f2a@linaro.org> Date: Thu, 6 Jul 2023 12:09:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 4/8] ASoC: codecs: wcd938x: fix resource leaks on component remove Content-Language: en-US To: Johan Hovold , Mark Brown , Vinod Koul Cc: Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20230705123018.30903-1-johan+linaro@kernel.org> <20230705123018.30903-5-johan+linaro@kernel.org> From: Srinivas Kandagatla In-Reply-To: <20230705123018.30903-5-johan+linaro@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/07/2023 13:30, Johan Hovold wrote: > Make sure to release allocated resources on component probe failure and > on remove. > > This is specifically needed to allow probe deferrals of the sound card > which otherwise fails when reprobing the codec component: > > snd-sc8280xp sound: ASoC: failed to instantiate card -517 > genirq: Flags mismatch irq 289. 00002001 (HPHR PDM WD INT) vs. 00002001 (HPHR PDM WD INT) > wcd938x_codec audio-codec: Failed to request HPHR WD interrupt (-16) > genirq: Flags mismatch irq 290. 00002001 (HPHL PDM WD INT) vs. 00002001 (HPHL PDM WD INT) > wcd938x_codec audio-codec: Failed to request HPHL WD interrupt (-16) > genirq: Flags mismatch irq 291. 00002001 (AUX PDM WD INT) vs. 00002001 (AUX PDM WD INT) > wcd938x_codec audio-codec: Failed to request Aux WD interrupt (-16) > genirq: Flags mismatch irq 292. 00002001 (mbhc sw intr) vs. 00002001 (mbhc sw intr) > wcd938x_codec audio-codec: Failed to request mbhc interrupts -16 > > Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver") > Cc: stable@vger.kernel.org # 5.14 > Cc: Srinivas Kandagatla > Signed-off-by: Johan Hovold > --- Reviewed-by: Srinivas Kandagatla > sound/soc/codecs/wcd938x.c | 55 +++++++++++++++++++++++++++++++++----- > 1 file changed, 48 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index 2e342398d027..be38cad5f354 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -2636,6 +2636,14 @@ static int wcd938x_mbhc_init(struct snd_soc_component *component) > > return 0; > } > + > +static void wcd938x_mbhc_deinit(struct snd_soc_component *component) > +{ > + struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component); > + > + wcd_mbhc_deinit(wcd938x->wcd_mbhc); > +} > + > /* END MBHC */ > > static const struct snd_kcontrol_new wcd938x_snd_controls[] = { > @@ -3131,20 +3139,26 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) > ret = request_threaded_irq(wcd938x->hphr_pdm_wd_int, NULL, wcd938x_wd_handle_irq, > IRQF_ONESHOT | IRQF_TRIGGER_RISING, > "HPHR PDM WD INT", wcd938x); > - if (ret) > + if (ret) { > dev_err(dev, "Failed to request HPHR WD interrupt (%d)\n", ret); > + goto err_free_clsh_ctrl; > + } > > ret = request_threaded_irq(wcd938x->hphl_pdm_wd_int, NULL, wcd938x_wd_handle_irq, > IRQF_ONESHOT | IRQF_TRIGGER_RISING, > "HPHL PDM WD INT", wcd938x); > - if (ret) > + if (ret) { > dev_err(dev, "Failed to request HPHL WD interrupt (%d)\n", ret); > + goto err_free_hphr_pdm_wd_int; > + } > > ret = request_threaded_irq(wcd938x->aux_pdm_wd_int, NULL, wcd938x_wd_handle_irq, > IRQF_ONESHOT | IRQF_TRIGGER_RISING, > "AUX PDM WD INT", wcd938x); > - if (ret) > + if (ret) { > dev_err(dev, "Failed to request Aux WD interrupt (%d)\n", ret); > + goto err_free_hphl_pdm_wd_int; > + } > > /* Disable watchdog interrupt for HPH and AUX */ > disable_irq_nosync(wcd938x->hphr_pdm_wd_int); > @@ -3159,7 +3173,7 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) > dev_err(component->dev, > "%s: Failed to add snd ctrls for variant: %d\n", > __func__, wcd938x->variant); > - goto err; > + goto err_free_aux_pdm_wd_int; > } > break; > case WCD9385: > @@ -3169,7 +3183,7 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) > dev_err(component->dev, > "%s: Failed to add snd ctrls for variant: %d\n", > __func__, wcd938x->variant); > - goto err; > + goto err_free_aux_pdm_wd_int; > } > break; > default: > @@ -3177,12 +3191,38 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) > } > > ret = wcd938x_mbhc_init(component); > - if (ret) > + if (ret) { > dev_err(component->dev, "mbhc initialization failed\n"); > -err: > + goto err_free_aux_pdm_wd_int; > + } > + > + return 0; > + > +err_free_aux_pdm_wd_int: > + free_irq(wcd938x->aux_pdm_wd_int, wcd938x); > +err_free_hphl_pdm_wd_int: > + free_irq(wcd938x->hphl_pdm_wd_int, wcd938x); > +err_free_hphr_pdm_wd_int: > + free_irq(wcd938x->hphr_pdm_wd_int, wcd938x); > +err_free_clsh_ctrl: > + wcd_clsh_ctrl_free(wcd938x->clsh_info); > + > return ret; > } > > +static void wcd938x_soc_codec_remove(struct snd_soc_component *component) > +{ > + struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component); > + > + wcd938x_mbhc_deinit(component); > + > + free_irq(wcd938x->aux_pdm_wd_int, wcd938x); > + free_irq(wcd938x->hphl_pdm_wd_int, wcd938x); > + free_irq(wcd938x->hphr_pdm_wd_int, wcd938x); > + > + wcd_clsh_ctrl_free(wcd938x->clsh_info); > +} > + > static int wcd938x_codec_set_jack(struct snd_soc_component *comp, > struct snd_soc_jack *jack, void *data) > { > @@ -3199,6 +3239,7 @@ static int wcd938x_codec_set_jack(struct snd_soc_component *comp, > static const struct snd_soc_component_driver soc_codec_dev_wcd938x = { > .name = "wcd938x_codec", > .probe = wcd938x_soc_codec_probe, > + .remove = wcd938x_soc_codec_remove, > .controls = wcd938x_snd_controls, > .num_controls = ARRAY_SIZE(wcd938x_snd_controls), > .dapm_widgets = wcd938x_dapm_widgets,