mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Johan Hovold <johan@kernel.org>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
	Neil Armstrong <neil.armstrong@linaro.org>,
	Robert Foss <rfoss@kernel.org>, Jonas Karlman <jonas@kwiboo.se>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Luca Ceresoli <luca.ceresoli@bootlin.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org,
	Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
	"H. Nikolaus Schaller" <hns@goldelico.com>,
	Dmitry Baryshkov <lumag@kernel.org>
Subject: Re: [PATCH] drm/bridge: display-connector: fix i2c adapter leak on probe failure
Date: Fri, 17 Jul 2026 15:20:35 +0300	[thread overview]
Message-ID: <20260717122035.GB1926197@killaraus.ideasonboard.com> (raw)
In-Reply-To: <20260717085716.1619275-1-johan@kernel.org>

Hi Johan,

Thank you for the patch.

On Fri, Jul 17, 2026 at 10:57:16AM +0200, Johan Hovold wrote:
> Make sure to drop the i2c adapter device and module references on failed
> regulator and enable gpio lookup (and regulator enable) during probe
> (e.g. on probe deferral).
> 
> Note that of_get_i2c_adapter_by_node() does not return error pointers,
> but i2c_put_adapter() can handle a NULL argument so the error pointer
> check at remove works even if it is misleading.

I've already sent a fix for this, see

https://lore.kernel.org/dri-devel/20260705213542.28987-3-laurent.pinchart+renesas@ideasonboard.com/

> Fixes: 2e2bf3a5584d ("drm/bridge: display-connector: add DP support")
> Fixes: 6de79dd3a920 ("drm/bridge: display-connector: add ddc-en gpio support")
> Fixes: 6eb6b6f0a012 ("drm/bridge: display-connector: handle hdmi-pwr supply")
> Cc: stable@vger.kernel.org	# 5.12
> Cc: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> Cc: H. Nikolaus Schaller <hns@goldelico.com>
> Cc: Dmitry Baryshkov <lumag@kernel.org>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/gpu/drm/bridge/display-connector.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
> index 16c0631adeb1..c38de5518211 100644
> --- a/drivers/gpu/drm/bridge/display-connector.c
> +++ b/drivers/gpu/drm/bridge/display-connector.c
> @@ -208,6 +208,13 @@ static int display_connector_get_supply(struct platform_device *pdev,
>  	return PTR_ERR_OR_ZERO(conn->supply);
>  }
>  
> +static void display_connector_put_ddc(void *_ddc)
> +{
> +	struct i2c_adapter *ddc = _ddc;
> +
> +	i2c_put_adapter(ddc);
> +}
> +
>  static int display_connector_probe(struct platform_device *pdev)
>  {
>  	struct display_connector *conn;
> @@ -328,6 +335,12 @@ static int display_connector_probe(struct platform_device *pdev)
>  			of_node_put(phandle);
>  			if (!conn->bridge.ddc)
>  				return -EPROBE_DEFER;
> +
> +			ret = devm_add_action_or_reset(&pdev->dev,
> +						       display_connector_put_ddc,
> +						       conn->bridge.ddc);
> +			if (ret)
> +				return ret;
>  		} else {
>  			dev_dbg(&pdev->dev,
>  				"No I2C bus specified, disabling EDID readout\n");
> @@ -403,9 +416,6 @@ static void display_connector_remove(struct platform_device *pdev)
>  		regulator_disable(conn->supply);
>  
>  	drm_bridge_remove(&conn->bridge);
> -
> -	if (!IS_ERR(conn->bridge.ddc))
> -		i2c_put_adapter(conn->bridge.ddc);
>  }
>  
>  static const struct of_device_id display_connector_match[] = {

-- 
Regards,

Laurent Pinchart

  reply	other threads:[~2026-07-17 12:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-17  8:57 Johan Hovold
2026-07-17 12:20 ` Laurent Pinchart [this message]
2026-07-17 14:51   ` Johan Hovold
2026-07-17 18:49     ` Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260717122035.GB1926197@killaraus.ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=airlied@gmail.com \
    --cc=andrzej.hajda@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hns@goldelico.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=johan@kernel.org \
    --cc=jonas@kwiboo.se \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luca.ceresoli@bootlin.com \
    --cc=lumag@kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=neil.armstrong@linaro.org \
    --cc=rfoss@kernel.org \
    --cc=simona@ffwll.ch \
    --cc=stable@vger.kernel.org \
    --cc=tomi.valkeinen@ideasonboard.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®