From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B1841DED4C for ; Thu, 23 Apr 2026 20:06:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776974794; cv=none; b=Va4duRvjx9InmaemvFa4LJ5A8SA1HRkeDwXqB+jgGCNuc60yAIWl/hwWmkBoZvmsK95g75SrWwSAujAtjKxqOweTHwdr1Dyhy4wOsOxpq3+y3uu6PGH1A+lK/3hFmWZB5WruKzsXmUllAPY6cwnocHp6zVObCkxp1lxQWbKN/EY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776974794; c=relaxed/simple; bh=gBUdYt8F9vwf7fIJJjN8lVFsQUrEL5iOBH05KEmqFVQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Z4zEtTflOfNDSP69/PjsYZzeU0zitUTGQqyFzPQQgSFSLNOkxpDbucCLbg70Jc/NCHV2sk+MvO9dofAnslJuwy66PxHepasjkbXcRb+CvdqZgk4mB0/OZGeqtVAe2BGTM5Gk8NQY1NycBt9U86xot/O6g6APaZ2daRQyihaSIHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hSm/yEil; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hSm/yEil" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso51724925e9.2 for ; Thu, 23 Apr 2026 13:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776974792; x=1777579592; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pr8ZXEmD5yrFHrl2Ct33Ap6JH6uM0Ws47D8sKfOxOo4=; b=hSm/yEilJRvyw/kP0TJkBcqBBMkBpCbOV347ldsJ2E2xBPpSvivdNZ3aXwvdZw1/qo AQKvQ9yB3cjuE7SXftCymdA9SNNrUd7yCldn9hgZ3+C9MGKyarmJZRqJ5g2NcEuvhEVJ HiQQ4XZHVzwwOOzslWQSwN0wAs8eYaH6AvRlUbTaZv5Gl0o62i9eMXnboLeFg3bik/bY m5NrKHBRzu7Y5w4HlrjYSbqMRoZKE/b96Ppmvucz+UKBb4Z3REN/EjoJbvZ1jpiwMT/r K0rwy03qdGRoYqUreWrJ4+qn5jKdVVsaPDlAEysyphJruzFjHAE9kq9exkrA5my9DnEK Bh4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776974792; x=1777579592; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pr8ZXEmD5yrFHrl2Ct33Ap6JH6uM0Ws47D8sKfOxOo4=; b=em48WS+sCA6HYVmZXapS16mAhv598cG2uYJXKb69nqpoHubl3ln8SjdIGEQiZe1d3D 6jULh/IKN9d+l1Vas4quHQGJd00RS69Ebn6Dk9og68KX3FbYZuwvaUsv9pIYkgiWk0eg /wI+mJxeLjZRrU/6mDMtc8a/GMu7D6GqBczcs40vDHZwVxSxBY3sPcISYyTTT5PMBEPS oz4B1B8OUmGnrDRrKu0h05Y3Ht9cHvmkj6XszX7+YxxAjI5+woQRmrPH+BjRTZD0RgC+ zhoMcN/U31zk6K+EXeLycGFd+nEm9BseMRWTUqHmp5XG2FKYuWZR/yY2rWNMOWMlxEKv ELPw== X-Forwarded-Encrypted: i=1; AFNElJ+Y/XLHbDC96KhuryPK+y2sy1W5ibg1jPGzaYNtFWIRJk20vPeVP1BqSvv+aNtuMu8uB8aiOn2BHT+J1HQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyvH7DZ98gGK+yE7GVNcN5acc2mBFMJFLO3GSE54kRHN/Os+8Q4 LO+WpBnJ+hW17pum7jOtTkW6JRx1E3lzelJU+4keakXAsFLP/hJwSf3x X-Gm-Gg: AeBDietKgi7sJmuHWUty90sxV7tGuE23g/zX4tBUGA670rgl9LOsmlW16otenu5zppF CNJJ6c4qOkJrtM8zutfsuVPq28RRshJa1f8wKX2ppVGCri1QRuNyhfP7WzRF0FItwzAFjIS7oL3 sDM99LcREsLgbWuEuAu8b7wiQLcNu9FE1AiwaxLmxd+ZWG9Lc0DJJXx5QRllnxETvnYriMWa3Xy 0mAIxNym7weeUievKs+U26+u1GgJp4tR3robJDc6vq4LLym5cvOO6/4Hae/Kv0d6esl9bu5fWfS eN15jkX7LZHiV92RE+qctRpzqEMdXR3T4/THtc4re955jnHJm8vlt7XLga+iVPDCsR1Y/XFtiW3 4NbRlDiHzMcp69Hp8csVG5tzhKw1dIQfDYttDdv32n6m1TF0V8Eu6tTSAnK3xfOle44q5lP58h9 yQNt5dWc0TctauDn6361iavFOPGTvY1ekptampj7RDZd4n9FJvvE79IwFgPOZGBCi4YWCjkkc= X-Received: by 2002:a05:600c:8587:b0:488:a797:f0ac with SMTP id 5b1f17b1804b1-488fb7880bdmr289804935e9.28.1776974791551; Thu, 23 Apr 2026 13:06:31 -0700 (PDT) Received: from osama.. ([2a02:908:1b6:8980:5f44:38d2:bccf:b54f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb75ab25sm167658815e9.11.2026.04.23.13.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 13:06:31 -0700 (PDT) From: Osama Abdelkader To: luca.ceresoli@bootlin.com, Alain Volmat , Raphael Gallais-Pou , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Osama Abdelkader , stable@vger.kernel.org Subject: [PATCH v3 1/3] drm/sti: remove bridge when sti_hda component_add fails Date: Thu, 23 Apr 2026 22:06:19 +0200 Message-ID: <20260423200622.325076-1-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop the manual drm_bridge_remove() in remove(). Check the return value of devm_drm_bridge_add(). Signed-off-by: Osama Abdelkader Fixes: d28726efc637 ("drm/sti: hda: add bridge before attaching") Cc: stable@vger.kernel.org --- v3: add Fixes and Cc tags v2: devm_drm_bridge_add instead of drm_bridge_add + goto remove_bridge --- drivers/gpu/drm/sti/sti_hda.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index b7397827889c..360a88ca8f0c 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -741,6 +741,7 @@ static int sti_hda_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct sti_hda *hda; struct resource *res; + int ret; DRM_INFO("%s\n", __func__); @@ -779,7 +780,9 @@ static int sti_hda_probe(struct platform_device *pdev) return PTR_ERR(hda->clk_hddac); } - drm_bridge_add(&hda->bridge); + ret = devm_drm_bridge_add(dev, &hda->bridge); + if (ret) + return ret; platform_set_drvdata(pdev, hda); @@ -788,10 +791,7 @@ static int sti_hda_probe(struct platform_device *pdev) static void sti_hda_remove(struct platform_device *pdev) { - struct sti_hda *hda = platform_get_drvdata(pdev); - component_del(&pdev->dev, &sti_hda_ops); - drm_bridge_remove(&hda->bridge); } static const struct of_device_id hda_of_match[] = { -- 2.43.0