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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 76FC9C47253 for ; Thu, 30 Apr 2020 16:35:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5710C2070B for ; Thu, 30 Apr 2020 16:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726472AbgD3QfG (ORCPT ); Thu, 30 Apr 2020 12:35:06 -0400 Received: from sauhun.de ([88.99.104.3]:53466 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726336AbgD3QfG (ORCPT ); Thu, 30 Apr 2020 12:35:06 -0400 Received: from localhost (p5486CDDB.dip0.t-ipconnect.de [84.134.205.219]) by pokefinder.org (Postfix) with ESMTPSA id A47D92C08FC; Thu, 30 Apr 2020 18:35:03 +0200 (CEST) Date: Thu, 30 Apr 2020 18:35:03 +0200 From: Wolfram Sang To: Alain Volmat , Jarkko Nikula Cc: robh+dt@kernel.org, mark.rutland@arm.com, pierre-yves.mordret@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, fabrice.gasnier@st.com Subject: Re: [PATCH] i2c: fix missing pm_runtime_put_sync in i2c_device_probe Message-ID: <20200430163503.GA15047@ninjato> References: <1588261401-11914-1-git-send-email-alain.volmat@st.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline In-Reply-To: <1588261401-11914-1-git-send-email-alain.volmat@st.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 30, 2020 at 05:43:21PM +0200, Alain Volmat wrote: > In case of the I2C client exposes the flag I2C_CLIENT_HOST_NOTIFY, > pm_runtime_get_sync is called in order to always keep active the > adapter. However later on, pm_runtime_put_sync is never called > within the function in case of an error. This commit add this > error handling. >=20 > Fixes: 72bfcee11cf8 ("i2c: Prevent runtime suspend of adapter when Host N= otify is required") Adding the patch author to CC. > Signed-off-by: Alain Volmat > --- > drivers/i2c/i2c-core-base.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c > index 139aea351ffb..2e4560671183 100644 > --- a/drivers/i2c/i2c-core-base.c > +++ b/drivers/i2c/i2c-core-base.c > @@ -338,8 +338,10 @@ static int i2c_device_probe(struct device *dev) > } else if (ACPI_COMPANION(dev)) { > irq =3D i2c_acpi_get_irq(client); > } > - if (irq =3D=3D -EPROBE_DEFER) > - return irq; > + if (irq =3D=3D -EPROBE_DEFER) { > + status =3D irq; > + goto put_sync_adapter; > + } > =20 > if (irq < 0) > irq =3D 0; > @@ -353,15 +355,19 @@ static int i2c_device_probe(struct device *dev) > */ > if (!driver->id_table && > !i2c_acpi_match_device(dev->driver->acpi_match_table, client) && > - !i2c_of_match_device(dev->driver->of_match_table, client)) > - return -ENODEV; > + !i2c_of_match_device(dev->driver->of_match_table, client)) { > + status =3D -ENODEV; > + goto put_sync_adapter; > + } > =20 > if (client->flags & I2C_CLIENT_WAKE) { > int wakeirq; > =20 > wakeirq =3D of_irq_get_byname(dev->of_node, "wakeup"); > - if (wakeirq =3D=3D -EPROBE_DEFER) > - return wakeirq; > + if (wakeirq =3D=3D -EPROBE_DEFER) { > + status =3D wakeirq; > + goto put_sync_adapter; > + } > =20 > device_init_wakeup(&client->dev, true); > =20 > @@ -408,6 +414,10 @@ static int i2c_device_probe(struct device *dev) > err_clear_wakeup_irq: > dev_pm_clear_wake_irq(&client->dev); > device_init_wakeup(&client->dev, false); > +put_sync_adapter: > + if (client->flags & I2C_CLIENT_HOST_NOTIFY) > + pm_runtime_put_sync(&client->adapter->dev); > + > return status; > } > =20 > --=20 > 2.17.1 >=20 --zYM0uCDKw75PZbzx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAl6q/jMACgkQFA3kzBSg KbbwFBAAhtQzzNeB/GCaKLSF1bZD7pXmWBQHwK11H0kJO7UkmEVuRuLNCn250MMa AOmgf8Y27Ij/cb5xcnLfWYpf/c8EKB68QnOawPIpu7P2loT3VwEOcbn3to8yi0WU 42ZJmWshB26DyiqaH6IWbqRNVL5t6qhPtnIbOU84pO5FExppXlB63kShSUKO2gXi kehrRerP6h8hZFYlz0wYSVgBpL/2B4BOydkCGlK4INoGtgIVGPwcrqP557ulqXe4 kTlu3uCeo3aZFfzmoeui+SoXvBPA1PdHOT4HZRs6Pcw1FFOed95JyrVJxSSiKK35 zGBOFjDTA9ZbfROzK3YHZR525uEQkceqGJHrRSpxqrM3o02sZXO/W2j359TbEHB2 PQncp1GAXNePayRakxrd9q8MpBoFRtiRiaGPZVuF9lCof+DERo27cpnINOc4E+Te WnW7QRxjyDguqkDdUZEdDGJ9nX6BO+Yg1OhoBQdjZ9vvnqrYMmRZZCDYNAU13ZLi lzR3mLPoyJMIj2c251mWUaNrm0nHZrw2PAmrNwygyu4MTmaZGxECu725lRNajqeu 1SuXby3l59NU+yKTze5oOhRvsjTP55mgDRVxzTbtnmZNDkE6EgKLsSvHG3PX6wAB YMBYlbSH6QxZ338/XA0Cvkbc4zn5vScALsa0lT6l69wtPPP6obk= =lXSI -----END PGP SIGNATURE----- --zYM0uCDKw75PZbzx--