From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF3C529DB64; Sat, 12 Sep 2026 15:56:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228595; cv=none; b=ip+0FU3UHhMRSFAjRfc29h6KKNY7+/3UqA8ny2lZKfZx0Yad+UWKyz88rEPqWbqZebvgZPdEQxpCaygmzoJhpokvNpehLvlucPPY8vHv2On9dyT9YBGqQ27hnZbQsIyJqfj75/09wEeqDlLd8Q+Vm0wYXw9JEHYRnU61c3zO5/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228595; c=relaxed/simple; bh=0M3GCxs+NlMyTMcM2vxDholOgPEy8x1Am+9mvy7t0uQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t1F0CHL3J8HYbiqeZvgogvL6bg5jn1DDNLzebV5fPUpawVqI4Gxep6YiUpacC0ezOG2IVwbgRI8hK0I1mqsw7MDZeMadWUQx3XAaUsFVHZCkt5y8iwPf1+XXj6pGZpWiWf621sWt4j1UVjYbY/OLA/ENx+o5NzE2LySg6csj0aQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1wkj89Qz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1wkj89Qz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D97F61F000FF; Sat, 12 Sep 2026 15:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789228593; bh=AhQquNzWGDUv+YF9Nfg7kJKooN/lX6NbDzkat+T1+qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1wkj89QzkJ4Sw1UikcDbsP0GHaUIs0bpSOWSMNEEYmurgSBDNUWwdekqTBV8KvVrw Ze0pZFHXxrXROQB38HZoV4FDPryS4PKEWe9Gcfq5hwNSQDTlQ9csrjC6q8VRprXCKf L0jpmdHYVoMh2UOFoSSpj4uymnvBPEPvNeQw/jF8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Douglas Anderson , Johan Hovold Subject: [PATCH 6.1 0415/1191] drm/panel-edp: fix i2c adapter leak on probe failure Date: Sat, 12 Sep 2026 08:52:23 +0200 Message-ID: <20260912065557.559326167@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit e2a9e291275a74e309a21cbb1def6296a72d6aed upstream. Make sure to drop the i2c adapter reference on probe failure (e.g. probe deferral) and on driver unbind also if a devicetree redundantly uses the 'ddc-i2c-bus' property to point to the aux ddc bus. Fixes: cc5a3fc041f0 ("drm/panel: panel-simple: Stash DP AUX bus; allow using it for DDC") Cc: stable@vger.kernel.org # 5.15 Reported-by: Douglas Anderson Link: https://lore.kernel.org/r/CAD=FV=VZPhzHU+Pet2m3L+Pqc7mOPfZC-f5p0OuNL79wNZPxRg@mail.gmail.com Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson Signed-off-by: Douglas Anderson Link: https://patch.msgid.link/20260717143119.1815106-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/panel/panel-edp.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -830,6 +830,13 @@ exit: return ret; } +static void panel_edp_put_adapter(void *_adap) +{ + struct i2c_adapter *adap = _adap; + + put_device(&adap->dev); +} + static int panel_edp_probe(struct device *dev, const struct panel_desc *desc, struct drm_dp_aux *aux) { @@ -877,6 +884,11 @@ static int panel_edp_probe(struct device if (!panel->ddc) return -EPROBE_DEFER; + + err = devm_add_action_or_reset(dev, panel_edp_put_adapter, + panel->ddc); + if (err) + return err; } else if (aux) { panel->ddc = &aux->ddc; } @@ -890,7 +902,7 @@ static int panel_edp_probe(struct device err = drm_panel_of_backlight(&panel->base); if (err) - goto err_finished_ddc_init; + return err; /* * We use runtime PM for prepare / unprepare since those power the panel @@ -931,9 +943,6 @@ static int panel_edp_probe(struct device err_finished_pm_runtime: pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); -err_finished_ddc_init: - if (panel->ddc && (!panel->aux || panel->ddc != &panel->aux->ddc)) - put_device(&panel->ddc->dev); return err; } @@ -948,8 +957,6 @@ static int panel_edp_remove(struct devic pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); - if (panel->ddc && (!panel->aux || panel->ddc != &panel->aux->ddc)) - put_device(&panel->ddc->dev); kfree(panel->edid); panel->edid = NULL;