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 9CDB22C11F9; Thu, 28 May 2026 20:19:48 +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=1779999589; cv=none; b=jdMT/4SI6siNtBcjfwm5y6TfRHaNWHfex7iKlliWZBLgW5einjVu4OZCkMYK8213w48qLQnnh+681WYjMQXnyccsNf6d9oqzqjZ/71VTuL+uBvKCX/WBA4WIqS1nSwXMcMGZPNrvHgEdli1TxV2iVp7TMHg4/clXO5oY9dkbThY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999589; c=relaxed/simple; bh=98/esds2eCQwjli5sZS64tLPmVyWBdDGXoYr9BP7Jns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Elpbl1QrtY9jxbkLE4mTRQJIo35Ho1UaP9T9x3S4vurrXbHk4fSxF4y9wXf+BiM1rmaNPUZnJIOiQs30rnG15De7IuQZMOQgIEk3R92Fuu7e+tcE6i0QfoS07evvROGTN4vzP6BnB7/isFe798qkoCxyf9YRHd5ocwMoQnLsnCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Yr1NWwzN; 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="Yr1NWwzN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 077BC1F000E9; Thu, 28 May 2026 20:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999588; bh=igEdafO1BvdeykcyTin45WOLs5NIMIii0ScH9j24Dx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Yr1NWwzNLcX2aWAXOXJeppEFx8fqBjtoKifKACS86XNZ/IRgwcTDYxEQECGJj68Ms QWq4WS/50eapwEQAINCjUI5TKPuXHvMY8Hnfv+B3SJ75l+Fo+Y1r20z41U48w0cuqU K6bcPFTsqRZAPPsKdvvgaQOYQOPaNwVEKZzy1Z7Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Osama Abdelkader , Luca Ceresoli Subject: [PATCH 6.18 113/377] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe Date: Thu, 28 May 2026 21:45:51 +0200 Message-ID: <20260528194641.604719390@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Osama Abdelkader commit 73d01051e8040c0b1de7fd26b3b8d0c2ffa6895c upstream. Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe. Signed-off-by: Osama Abdelkader Fixes: 8dde6f7452a1 ("drm: bridge: icn6211: Add I2C configuration support") Cc: stable@vger.kernel.org Reviewed-by: Luca Ceresoli Link: https://patch.msgid.link/20260430194944.78119-1-osama.abdelkader@gmail.com Signed-off-by: Luca Ceresoli Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/bridge/chipone-icn6211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -758,7 +758,9 @@ static int chipone_i2c_probe(struct i2c_ dev_set_drvdata(dev, icn); i2c_set_clientdata(client, icn); - drm_bridge_add(&icn->bridge); + ret = devm_drm_bridge_add(dev, &icn->bridge); + if (ret) + return ret; return chipone_dsi_host_attach(icn); }