From nobody Fri May 8 05:17:36 2026 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 DDA96C433EF for ; Tue, 10 May 2022 15:34:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346035AbiEJPhz (ORCPT ); Tue, 10 May 2022 11:37:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345909AbiEJPht (ORCPT ); Tue, 10 May 2022 11:37:49 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 444EC289A6 for ; Tue, 10 May 2022 08:33:19 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so2315376pjb.3 for ; Tue, 10 May 2022 08:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XgBcNoHF+H5YHWhoRdIUmpBDPDoFkHi2u+F0mxHHboU=; b=SqlnRkOBavZUfRbJwMbK/YH4lJboO/H6W9MGbF1Yr8P3VdOycLTYi6X8sxipFmctzz Sip8xnN1tVt+E+KB3GObsdE4JlFanBX/u27osIqtF0PSPAJ1XR1F6QACv6LQIc4U/dyr 7jwaKmTINGJsQxtoXTY7xQt+ULsVPni3miKhV6QEWS8GpL0apIdYLDp4iizJ0IwJcrGO Z1kAXxv/Gg20ZCFB5DSXa7QGkB1NNF9jcxOpv2NgM7kfpcR3+mRvB6jQKpjcoKhg0ZzR AlHth8RnP5dD7DJ7f9MwHjTrZuGMgQcr4lFnA96B7sJJvi+GRlZtDzbImfHt7wyaFTvi z+iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XgBcNoHF+H5YHWhoRdIUmpBDPDoFkHi2u+F0mxHHboU=; b=z380iZvzNUW5D4tkT4ceaPATwOHx1wIi1EQcxYd1ZR08SQ85czW+yDx5chBr8+2jHq U4Ug7sCctW98Gm0T2aDjUad1VOq2Dtnwn/d1smApBVj4lFaNSJ4V52sePYxJuycWi6S/ v4EeexGWj/2f6D96jWNsy+iRgQcdY3jl0LBCdTPmITfzOQJ8TQJ5fvSz0RNbl4xcwPf1 fuvNF909lVSt0Yk/RbShtlh6We3u5e/YSIwTE6dy5lzda6S7rkfITMgGV2jTA5kvVNgN nhESsz7v/cui6+RL0xsX3JstFlZ7dazziIpa2fDrOSvhrjzxdvyHgFcYdmZcBLd3EPY2 pu/w== X-Gm-Message-State: AOAM532U53md7rtGlk+hfNuC8NqjiXrDIwSW+WmoLUwIR5O7M/5iF6Io F2JzRnyrlJ6b7YhVRLh4GA== X-Google-Smtp-Source: ABdhPJxIg+lFFBXwy/xu/9dN8ld18Dmoa8zxjI0DMkcnvYRYOp5IZmTm31F5Gz51fbFrsofGjLfMyA== X-Received: by 2002:a17:90b:4a90:b0:1dc:aec3:c04 with SMTP id lp16-20020a17090b4a9000b001dcaec30c04mr546709pjb.118.1652196798797; Tue, 10 May 2022 08:33:18 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:18 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 1/6] ASoC: cs42l52: Fix the error handling of cs42l56_i2c_probe() Date: Tue, 10 May 2022 23:32:46 +0800 Message-Id: <20220510153251.1741210-2-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The driver should goto label 'err_enable' when failing at regmap_read(). Signed-off-by: Zheyu Ma --- sound/soc/codecs/cs42l56.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 2c4e09b43199..dc23007336c5 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -1245,7 +1245,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_c= lient) ret =3D regmap_read(cs42l56->regmap, CS42L56_CHIP_ID_1, ®); if (ret) { dev_err(&i2c_client->dev, "Failed to read chip ID: %d\n", ret); - return ret; + goto err_enable; } =20 devid =3D reg & CS42L56_CHIP_ID_MASK; --=20 2.25.1 From nobody Fri May 8 05:17:36 2026 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 58788C433F5 for ; Tue, 10 May 2022 15:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345984AbiEJPiO (ORCPT ); Tue, 10 May 2022 11:38:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345877AbiEJPhv (ORCPT ); Tue, 10 May 2022 11:37:51 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F3E8FD76 for ; Tue, 10 May 2022 08:33:27 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id m12so3322003plb.4 for ; Tue, 10 May 2022 08:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eag9/N12Mu3KYJJ0B0WDBdKQD2EGzDc2Cj2dmt69sIg=; b=hlIhyjXWWaS429dekFzsxpoSrs74VJmufWGmWV5tWMWylXvaSzSNiV8KwCOJCJl/ms 5lbySympGAvbFfBejHNe6TUiO8nLo944xo9TetryJDHFoNW1CJ6DqnyFORYry4nd86QB OtqaS3H4VNJoR7k1pLVLtc46D3wHeTIp50VOuCZdQYksAwdjKdu1uddenfl+8+/oe0nK YfCSxtVHXQDP1BZMTP4/zxV3ObVeZkmYfe9kmg43VpNd9v2sdxTyCDMWMCSqhP8jUk1F +FvfwoIdU0wwxnS9G8SWQNXjAjVvpDfTRT/2ZApNxpAAdnWZIkEsAyiM5DMReiwzC8we 8lbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eag9/N12Mu3KYJJ0B0WDBdKQD2EGzDc2Cj2dmt69sIg=; b=zkgozzIxncoo/dTYFwl9U/aFlv4daAWXRltnZqREdfM1uA1umDVuujnjx1BqYVKY4x U42wq69TS4p6igwIHr6KLJbgiCUQ2+umJ2MAnBWFibdKas92JEJMTxCDxbp+J8dpwOWT fuXvlOKnZeNaBXu59p1xKoHnX37sZBj3qgi0o5vupUfuJoTzD32p4cHNthjktc/V4Jr7 RMrusKgz9+sWKa7FosslScEgoNiyczx6rW4yZcdbsT+OT13dulGC4xsiCDvymKTi4y+O EOG+R7lfeWSh38XVq5BJSK4y7vLZM2y8+4ODRMveV9YelqLARaJIGN/yMjDG8qZwjSoz cj8w== X-Gm-Message-State: AOAM530B+R5+gaGuYXunOSdEbhwyLxfNIpoG8E8jhJNq4hiFIuayZb02 eQbosDgSW/2nddHqGrOqFg== X-Google-Smtp-Source: ABdhPJxFNiE/WgSKaJPA7RFpU5aiK16uBpllXCpM3cyKm0NYEOM3FXJtOGT7rNWzr+Vz36Pu6iKMpQ== X-Received: by 2002:a17:902:edc7:b0:15b:4196:1957 with SMTP id q7-20020a170902edc700b0015b41961957mr20688090plk.161.1652196806644; Tue, 10 May 2022 08:33:26 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:26 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 2/6] ASoC: cs35l36: Fix the error handling of cs35l36_i2c_probe() Date: Tue, 10 May 2022 23:32:47 +0800 Message-Id: <20220510153251.1741210-3-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The driver should goto label 'err' when failing at regmap_read(). Signed-off-by: Zheyu Ma Acked-by: Charles Keepax --- sound/soc/codecs/cs35l36.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c index cc5e80222916..920190daa4d1 100644 --- a/sound/soc/codecs/cs35l36.c +++ b/sound/soc/codecs/cs35l36.c @@ -1803,7 +1803,7 @@ static int cs35l36_i2c_probe(struct i2c_client *i2c_c= lient) if (ret < 0) { dev_err(&i2c_client->dev, "Failed to read otp_id Register %d\n", ret); - return ret; + goto err; } =20 if ((l37_id_reg & CS35L36_OTP_REV_MASK) =3D=3D CS35L36_OTP_REV_L37) --=20 2.25.1 From nobody Fri May 8 05:17:36 2026 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 4CB5FC433F5 for ; Tue, 10 May 2022 15:34:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242851AbiEJPin (ORCPT ); Tue, 10 May 2022 11:38:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346042AbiEJPhz (ORCPT ); Tue, 10 May 2022 11:37:55 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DA8113CA0A for ; Tue, 10 May 2022 08:33:35 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id x23so15234080pff.9 for ; Tue, 10 May 2022 08:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XUdUcfiagybpsQd1lg5V2fMeg0EXQcI6829QJGv7lks=; b=QvY4Ezq+fW8krO2OWe5Wx3kco/r+crV5eM0nwCM02Ofn4Qg7Qa2uUWgmNMxQvf5GzW 3CzrriRzkyIZP7KTfQXKpPH9KBtIOOG+se2tgtqH2+kiz+C3iWntyhUedg7hWyIz8SVn CR5CehLZ40IueILzP+w0dBR9okD5t4jqeBp1EDIFQ/5nNqsRQGQ8VEAiTzcqzyxV7lYh MVfjVZJGo2NFi/rVHK8xAmFW/go+ywwLx8oT3BCVmYdwYXrhT4+aO9JMjp8b5ZjkemnO MDvf3sHPZt94kiWUkzQ2CB5ZDwFdU1ioPbjUkZBZrd41klzat64x5r/Ow1WM8drWNvBR zffw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XUdUcfiagybpsQd1lg5V2fMeg0EXQcI6829QJGv7lks=; b=qSKR0s1lK/pjX4lzwPEtXoo/xw7YpoqLAiv0vc/NLbem4kkjWGwZC6U6NAH0ic7IeZ hTPGa+SdbN6P+Mbxz00ogZ8Vg82gJLudWiqHCf4xM7kmE+XAoVF+noQIpKv6EWh24hLy TDc/CNLBM4hyXykYnWrsEQ1amjAF6JGDx7NdetVexH/MrNfUIbC7xHYSCfCpFOXGyJOp FwOET6GEfMpwdc0E8vZzzg8Qmpo/9lBMzyMy9YxBjnYxE0L8YEV4WtFBgsEq5a/bSyXX 5MZRxQIdb1roogvqKyNidMFQdq5bktp+Sdudnj/AclreZ1Mi4CTQl4C103SgCKvgeA+X jcvw== X-Gm-Message-State: AOAM5333Uyn6vHjmd/WiiLZ+ncD3NFXFxJ90x+1crcSRiVpOwqhCVwbL wnLVdlsFRLvKIXIIUu+C9g== X-Google-Smtp-Source: ABdhPJz6N6qu89EDF0qEJaevMwCr86YbRgvjBFpTUFU7LzuQoM3gKa7lp4Q1bFnsxtUTB5NhIbzAfg== X-Received: by 2002:a62:d0c5:0:b0:50d:a467:3cc8 with SMTP id p188-20020a62d0c5000000b0050da4673cc8mr21129069pfg.81.1652196814749; Tue, 10 May 2022 08:33:34 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:34 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 3/6] ASoC: rt5645: Fix the error handling of rt5645_i2c_probe() Date: Tue, 10 May 2022 23:32:48 +0800 Message-Id: <20220510153251.1741210-4-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" After enabling the regulator, The driver should disable the regulator when failing at probing. Signed-off-by: Zheyu Ma --- sound/soc/codecs/rt5645.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 1518eb7e9201..ccdea234a3ba 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3943,7 +3943,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c) ret =3D PTR_ERR(regmap); dev_err(&i2c->dev, "Failed to allocate temp register map: %d\n", ret); - return ret; + goto err_enable; } =20 /* @@ -3974,7 +3974,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c) ret =3D PTR_ERR(rt5645->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - return ret; + goto err_enable; } =20 regmap_write(rt5645->regmap, RT5645_RESET, 0); --=20 2.25.1 From nobody Fri May 8 05:17:36 2026 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 1A5C7C433F5 for ; Tue, 10 May 2022 15:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345938AbiEJPis (ORCPT ); Tue, 10 May 2022 11:38:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346047AbiEJPh4 (ORCPT ); Tue, 10 May 2022 11:37:56 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D3CE1D5275 for ; Tue, 10 May 2022 08:33:43 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id 204so12448323pfx.3 for ; Tue, 10 May 2022 08:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sDdu0AZ+jhN6LtNsF/DsY4tnnS9mzbYgTFP2SBX4foc=; b=DjyipPBYQ6Mz0BJ2YvmmPz0cPF4YSA0a+fMtYgqkJ77LqbIEqTP2yuaOxzXI8J7Puz YzVfttMONRDIJC1uBKKFmiOMdzXhIY9xzklKp1v6OLrinXC4FwDdGdvem9IooJboBvQy GK3dj2Q+gZYRcoEU7Z7AiRFj/wT5y5HMn74dI7mKWcCAPxzbxqc3nUTTc71NsoQZPHgZ jysRaf4Dr0FqZBFsUbvMJw3fhoye8auxXOIELHpDwhvf02EHOeW5Hk0Jq5xfIZZk+ghD 6oQdmho2n+LrTWDfHjY0tktn7MLxE9rfJyCILgySVpSsBEMTM2+WKb/gJpGdMt1NhQz/ LdOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sDdu0AZ+jhN6LtNsF/DsY4tnnS9mzbYgTFP2SBX4foc=; b=xMO04qA3ohBHg79TE+UeEyVMxbQLNtFB1Ri6FnarLlHH+KNs2CMeCpRpfFzfusiw+R Lj2vjsAHL2SbatYHCQ1xlDe/oOKnx8Kya4QmKKmMIp+GCezHeq415fplLRdb6FyTLJOl qCilNJWBaTS+Ye6OOFK12TgnKecHpPMIdC9dHvaX+5jDdqvN2m4InEKQtG1ClqTxwDAN ackI/CXncE/AcMDgEVyDq2SDDePce6rjhJdyAvitKydS9NlRK4ahVLcAgfGlP66CQ3Lu /NIp4bFj7jMHWP1rM5Go/9DTvmWJgjnVUdQSEB/ENojeJ6cwIsyPegAw1tcwGoEOV+D9 wpKA== X-Gm-Message-State: AOAM533LPEBlk8+fz/5TIz/J53apfHlUe71V2O88IV/2ug6y+SBEV77M ZwMfv797Z/fB75PpN+d/Wg== X-Google-Smtp-Source: ABdhPJw4MmnXegA0D1ntyoBvAJlyQNEK5XXB9HZ+vF5ceB7uq8uJuv4AGpKomxKh2ohAEsSAha8rIQ== X-Received: by 2002:a63:fd51:0:b0:3c1:977e:1fed with SMTP id m17-20020a63fd51000000b003c1977e1fedmr16894976pgj.246.1652196822757; Tue, 10 May 2022 08:33:42 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:42 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 4/6] ASoC: tas571x: Fix the error handling of tas571x_i2c_probe() Date: Tue, 10 May 2022 23:32:49 +0800 Message-Id: <20220510153251.1741210-5-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" After enabling the regulator, The driver should disable the regulator when failing at probing. Signed-off-by: Zheyu Ma --- sound/soc/codecs/tas571x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c index dd289774efb2..7b599664db20 100644 --- a/sound/soc/codecs/tas571x.c +++ b/sound/soc/codecs/tas571x.c @@ -833,7 +833,8 @@ static int tas571x_i2c_probe(struct i2c_client *client) if (IS_ERR(priv->pdn_gpio)) { dev_err(dev, "error requesting pdn_gpio: %ld\n", PTR_ERR(priv->pdn_gpio)); - return PTR_ERR(priv->pdn_gpio); + ret =3D PTR_ERR(priv->pdn_gpio); + goto disable_regs; } =20 priv->reset_gpio =3D devm_gpiod_get_optional(dev, "reset", @@ -841,7 +842,8 @@ static int tas571x_i2c_probe(struct i2c_client *client) if (IS_ERR(priv->reset_gpio)) { dev_err(dev, "error requesting reset_gpio: %ld\n", PTR_ERR(priv->reset_gpio)); - return PTR_ERR(priv->reset_gpio); + ret =3D PTR_ERR(priv->reset_gpio); + goto disable_regs; } else if (priv->reset_gpio) { /* pulse the active low reset line for ~100us */ usleep_range(100, 200); --=20 2.25.1 From nobody Fri May 8 05:17:36 2026 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 ED593C433F5 for ; Tue, 10 May 2022 15:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242814AbiEJPiz (ORCPT ); Tue, 10 May 2022 11:38:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345933AbiEJPih (ORCPT ); Tue, 10 May 2022 11:38:37 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5021F15BF for ; Tue, 10 May 2022 08:33:50 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id x52so15241485pfu.11 for ; Tue, 10 May 2022 08:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JCXe0wXtApkFt+51sQevrUY9NGf5KMQ0zb0sSdWlRTM=; b=oeMMxho23U1nt4kB5/OiiGKWPW0aBfGIBhekswXi29AXRBPmAKIp1Vccofvqw7Y73R eDkaGyMh1v+OYfQMI5qUgfRDLV28JFQn34l66u4qjN0f8b1NmnL4EqQH1WA1CSO0nV7K iqHI5k+Oh4uvS48sKrApyy3d6jfQgZ1Tee+8Jc/5cNoAfE6CHOHlwA0bj+QJ1r/l2TBf A411E2agO4eedeIefsR+oKvbirwIjb4Cva3U/q7vjMgRY6PvDo5LMwAQzaVCzI41s/bP 9KbaxZ0jt56cMXJnHT5ncSPBJ4yPotcRELk51D/CA+YxLGjWtaB4HFGjr/rMOVa/7U1d 8S7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JCXe0wXtApkFt+51sQevrUY9NGf5KMQ0zb0sSdWlRTM=; b=TFuaYfwF7CPXJVNU9yX/g1U84XkGIG1hjscqlamO6kUOP9dJdhiEF2KdXIypDVvDN1 kYx53QRXHTJqFdQ3OAkRMqz4vb2Hm7FbLCG6jxEdoJieTVaNVm1fb//Bie1yw5Wh9a/X pRiTyfGi0F3CQQny8pKAR5ENKcR4OA0h6CbzIJ68nfEODXZTBFkw1tP2VcW5OkkWTVUv qXC9mn+ohLxffbNdjIR5RviD/3iWlPd5p+Mkj8XWuRI160kNUzW6aLt+S+/4UKkURozI lUpFfD83eBD9E1Bn8/zqv0n5Cd4lhYn8VXDyD/oyJo7bmRgTbn8WJTICFCvAPiZHas9k UBgQ== X-Gm-Message-State: AOAM530Ed1mrWi9kA+gT1XbG10E4oAeDi7YYtthEaAkAV2BANMSDulOD dOkENKeawwNqYB5adlDnsw== X-Google-Smtp-Source: ABdhPJymdQLmnMeadu7zJaG6Axddm9eIn3kMd/AHeVLO1r8GTjTSUp0gO0bYjtmy+WK69CiGNo8cjQ== X-Received: by 2002:a65:63d1:0:b0:3c6:25b2:22ba with SMTP id n17-20020a6563d1000000b003c625b222bamr17306825pgv.360.1652196830491; Tue, 10 May 2022 08:33:50 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:50 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 5/6] ASoC: tas6424: Fix the error handling of tas6424_i2c_probe() Date: Tue, 10 May 2022 23:32:50 +0800 Message-Id: <20220510153251.1741210-6-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" After enabling the regulator, The driver should disable the regulator when failing at probing. Signed-off-by: Zheyu Ma --- sound/soc/codecs/tas6424.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c index d87444efed37..22b53856e691 100644 --- a/sound/soc/codecs/tas6424.c +++ b/sound/soc/codecs/tas6424.c @@ -756,7 +756,7 @@ static int tas6424_i2c_probe(struct i2c_client *client) TAS6424_RESET, TAS6424_RESET); if (ret) { dev_err(dev, "unable to reset device: %d\n", ret); - return ret; + goto disable_regs; } =20 INIT_DELAYED_WORK(&tas6424->fault_check_work, tas6424_fault_check_work); @@ -765,10 +765,14 @@ static int tas6424_i2c_probe(struct i2c_client *clien= t) tas6424_dai, ARRAY_SIZE(tas6424_dai)); if (ret < 0) { dev_err(dev, "unable to register codec: %d\n", ret); - return ret; + goto disable_regs; } =20 return 0; + +disable_regs: + regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies), tas6424->supplies); + return ret; } =20 static int tas6424_i2c_remove(struct i2c_client *client) --=20 2.25.1 From nobody Fri May 8 05:17:36 2026 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 7A878C433F5 for ; Tue, 10 May 2022 15:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345930AbiEJPjK (ORCPT ); Tue, 10 May 2022 11:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346015AbiEJPii (ORCPT ); Tue, 10 May 2022 11:38:38 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E8B41F8C64 for ; Tue, 10 May 2022 08:33:58 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id j10-20020a17090a94ca00b001dd2131159aso2360254pjw.0 for ; Tue, 10 May 2022 08:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/E2oYMHtBAv9GRmZnfohgrg/949ahcguOuaoSrbKbFI=; b=RDmrB2J1ZPEIKprdrdCO4avF6oVrb5+pne/vzaqtN87noNp1Bli0oHQ6wyNpTU5vI1 0SMhWzqr/HweH8BysNB5VTufUNTaKfODRGH5FgOUYQ1X4JaIF/BwdanaQDrV2rglyxPt gIewzpg+83SMO+qXQynhd74vUUH+dm9cIht1XWcryYKFAbDvU8Uilwfs2axnl1zXzElJ NXAYgg1A06xTdfzeiA3A8G57Mz1A8mJIf/qsKD98jkERgTPWi9bW4xtie1blxVu3ulTS 9zMUXo4w1IAjkCcy0283xKmVQIlCE5QKfr5XSqXAddvBxly0Fow8UPJhqaWohu3WG3Qs 30Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/E2oYMHtBAv9GRmZnfohgrg/949ahcguOuaoSrbKbFI=; b=ZSYfG7EAqzh/cu9K6ud4fziFp8lJM7OxLW1d2vB5F/3ulmM91ieK/6CsWbXdO5zxGI R6BEvxGkZBUBT7ySJEGgsPWmNMTQXlcuWIldIrxfjtgVdFrAM6BqRSkETosvDgKVzbWw UwPudO0M8otwCSttPysZuu8GAVMOPEvzUoThrAuqhaXQesW5fP74twqg/NlJY/jIxqqz BK5XoAUxlMfTrQIqpnuivmhgb0LN6NfCbfn4V+7z2+DN0aiG7xfps1NOtZCCrpWGE+If Xv5nFBPUrUMewQAl7+bK63TgA8/SOFLOGu/BJ3u3ZUESQp5Jm0KDcE1CLaA+YadbmbDL eTQQ== X-Gm-Message-State: AOAM531WMq7gcVpLQRDDg98MiXXGrvLO2jfuOh9rPhiveGpXZd9dzJpk dJLe8zwk2UML55f1R/cN7g== X-Google-Smtp-Source: ABdhPJy9vXUe8rOvHkj/a1GsFzkDy1LxLZuiQxGOh9KaM/XcRQNRmQ/qpQDd7DGC190YEyfTcsaVTA== X-Received: by 2002:a17:90b:4f41:b0:1de:bd14:7721 with SMTP id pj1-20020a17090b4f4100b001debd147721mr149484pjb.9.1652196838221; Tue, 10 May 2022 08:33:58 -0700 (PDT) Received: from localhost.localdomain ([144.202.91.207]) by smtp.gmail.com with ESMTPSA id cd10-20020a056a00420a00b0050dc76281d0sm11104248pfb.170.2022.05.10.08.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 08:33:57 -0700 (PDT) From: Zheyu Ma To: james.schulman@cirrus.com, david.rhodes@cirrus.com, tanureal@opensource.cirrus.com, rf@opensource.cirrus.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, oder_chiou@realtek.com Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Zheyu Ma Subject: [PATCH 6/6] ASoC: wm8903: Fix the error handling of wm8903_i2c_probe() Date: Tue, 10 May 2022 23:32:51 +0800 Message-Id: <20220510153251.1741210-7-zheyuma97@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510153251.1741210-1-zheyuma97@gmail.com> References: <20220510153251.1741210-1-zheyuma97@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The driver should goto label 'err' when failing to request the irq. Signed-off-by: Zheyu Ma Acked-by: Charles Keepax --- sound/soc/codecs/wm8903.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index ddcef11dce7c..3c95c2aea515 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -2131,7 +2131,7 @@ static int wm8903_i2c_probe(struct i2c_client *i2c) if (ret !=3D 0) { dev_err(wm8903->dev, "Failed to request IRQ: %d\n", ret); - return ret; + goto err; } =20 /* Enable write sequencer interrupts */ --=20 2.25.1