From nobody Wed Feb 11 21:33:49 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 EA186C77B6E for ; Wed, 12 Apr 2023 10:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229484AbjDLK4O (ORCPT ); Wed, 12 Apr 2023 06:56:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjDLK4M (ORCPT ); Wed, 12 Apr 2023 06:56:12 -0400 Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D89E06A7D for ; Wed, 12 Apr 2023 03:56:09 -0700 (PDT) Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33C8pegq006573; Wed, 12 Apr 2023 12:55:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=xBkM+wcHkn0+wAwRzFfs1U5GhFDjurk++GN6bVOC3Og=; b=hYYb7Puy4Sd9NST1T9rTluYjt9fkZUkBdjbAMEmsqWe/MDXGCbMfVDuJS4e578xRxD4z ICgTiNV5snAnd0j27ibk4LmwxfIJRKi+2f05ICcT+8ZDOdWYPZLj7SV9v69QZwP6kzeF 1w5wd8CuiIOg+r+SDEstNkcobsyRmC1hz8qDuhSWbtJoYRM7ErFp8F4BAWLGfGdPztv2 /UjEHRk2ZaAE4k+eZp9W8vFKk7vQbbaxSbitUmZJjGrtKHE3NnwcMAoPB3lrIAfRzPZZ VVHbU1qyscEeQrVI7rlTLoY7Go7PAOAs871h/6LBQWJTdv7qKOs+6+boBUoyDVCPX7ta 5w== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3pwsgp91ra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 12:55:57 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 40FC9100034; Wed, 12 Apr 2023 12:55:57 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 3AF0D2128D0; Wed, 12 Apr 2023 12:55:57 +0200 (CEST) Received: from localhost (10.252.10.182) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 12 Apr 2023 12:55:57 +0200 From: Amelie Delaunay To: Lee Jones , Maxime Coquelin , Alexandre Torgue CC: , , , Amelie Delaunay Subject: [RESEND PATCH 1/2] mfd: stmfx: Fix error path in stmfx_chip_init Date: Wed, 12 Apr 2023 12:55:41 +0200 Message-ID: <20230412105542.1231131-2-amelie.delaunay@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230412105542.1231131-1-amelie.delaunay@foss.st.com> References: <20230412105542.1231131-1-amelie.delaunay@foss.st.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.252.10.182] X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-12_03,2023-04-12_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In error path, disable vdd regulator if it exists, but don't overload ret. Because if regulator_disable() is successful, stmfx_chip_init will exit successfully while chip init failed. Fixes: 06252ade9156 ("mfd: Add ST Multi-Function eXpander (STMFX) core driv= er") Signed-off-by: Amelie Delaunay --- drivers/mfd/stmfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index e281971ba54e..bfe89df27611 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -387,7 +387,7 @@ static int stmfx_chip_init(struct i2c_client *client) =20 err: if (stmfx->vdd) - return regulator_disable(stmfx->vdd); + regulator_disable(stmfx->vdd); =20 return ret; } --=20 2.25.1 From nobody Wed Feb 11 21:33:49 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 192F9C77B71 for ; Wed, 12 Apr 2023 10:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229670AbjDLK4S (ORCPT ); Wed, 12 Apr 2023 06:56:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbjDLK4N (ORCPT ); Wed, 12 Apr 2023 06:56:13 -0400 Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACB26A69 for ; Wed, 12 Apr 2023 03:56:11 -0700 (PDT) Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33C9Ft8P001546; Wed, 12 Apr 2023 12:55:58 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=A+lMTa0nB7HohOca8aARuO3o3kfnPHCwrPixYCAy+Cc=; b=6zNuOrcdJpp999pZetREP/7mwIM30FfwC/aIbyQzH5FmhijimSA2YIksbLKS8ZwBgaRg iMsxV/FykoB7vhp0XVUc0r5t9wlYzAVALYbZ/MbAUOXGKEGEUvuwjYIoCAx0D41ERtB2 Hhc8nNI0Gc53V/5uKLyH9Q04F5/bajFUBHgHLIdInco3Iz4izzlZTNLjzV0bopJgsrU6 Ixxyw+RLdZivw0jfPILr0UjXPvM7Gjn7hKA+Xx++6h/spyjtRpjJEaYcMmmMf9csmIbr B6kT8FDZcUoZ8oDLa1R9KKHdKR1ho5lMRYHcYP2MzcToB94dORvjuLCNuV/p2sRKh16b wQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3pw8b0pgrq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 12:55:58 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id D06A510002A; Wed, 12 Apr 2023 12:55:57 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id CA2C92128D0; Wed, 12 Apr 2023 12:55:57 +0200 (CEST) Received: from localhost (10.252.10.182) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 12 Apr 2023 12:55:57 +0200 From: Amelie Delaunay To: Lee Jones , Maxime Coquelin , Alexandre Torgue CC: , , , Amelie Delaunay Subject: [RESEND PATCH 2/2] mfd: stmfx: Nullify stmfx->vdd in case of error Date: Wed, 12 Apr 2023 12:55:42 +0200 Message-ID: <20230412105542.1231131-3-amelie.delaunay@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230412105542.1231131-1-amelie.delaunay@foss.st.com> References: <20230412105542.1231131-1-amelie.delaunay@foss.st.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.252.10.182] X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-12_03,2023-04-12_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Nullify stmfx->vdd in case devm_regulator_get_optional() returns an error. And simplify code by returning an error only if return code is not -ENODEV, which means there is no vdd regulator and it is not an issue. Fixes: d75846ed08e6 ("mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_in= it()") Signed-off-by: Amelie Delaunay --- drivers/mfd/stmfx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index bfe89df27611..76188212c66e 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -330,9 +330,8 @@ static int stmfx_chip_init(struct i2c_client *client) stmfx->vdd =3D devm_regulator_get_optional(&client->dev, "vdd"); ret =3D PTR_ERR_OR_ZERO(stmfx->vdd); if (ret) { - if (ret =3D=3D -ENODEV) - stmfx->vdd =3D NULL; - else + stmfx->vdd =3D NULL; + if (ret !=3D -ENODEV) return dev_err_probe(&client->dev, ret, "Failed to get VDD regulator\n"= ); } =20 --=20 2.25.1