When drm_bridge_attach() fails, the function should return an error
instead of continuing execution.

Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-dp.c b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
index 82aaf74e1bc0..b6fe313ccaf8 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
@@ -2062,8 +2062,10 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,
 	}
 
 	ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-	if (ret)
+	if (ret) {
 		dev_err_probe(dev, ret, "Failed to attach bridge\n");
+		return ERR_PTR(ret);
+	}
 
 	dw_dp_init_hw(dp);
 
-- 
2.43.0

On Fri Dec 26, 2025 at 11:32 PM CET, Osama Abdelkader wrote:
> When drm_bridge_attach() fails, the function should return an error
> instead of continuing execution.
>
> Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>

Looks like a bugfix, should it have a 'Fixes:' tag and 'Cc: stable@...'?
See https://docs.kernel.org/process/submitting-patches.html

> --- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> @@ -2062,8 +2062,10 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,
>  	}
>
>  	ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
> -	if (ret)
> +	if (ret) {
>  		dev_err_probe(dev, ret, "Failed to attach bridge\n");
> +		return ERR_PTR(ret);
> +	}
>
>  	dw_dp_init_hw(dp);
>

It could be more concise, without adding braces:

	if (ret)
		return ERR_PTR(dev_err_probe(dev, ret, "Failed to attach bridge\n"));

Luca

--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

On Wed, Dec 31, 2025 at 03:09:51PM +0100, Luca Ceresoli wrote:
> On Fri Dec 26, 2025 at 11:32 PM CET, Osama Abdelkader wrote:
> > When drm_bridge_attach() fails, the function should return an error
> > instead of continuing execution.
> >
> > Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
> 
> Looks like a bugfix, should it have a 'Fixes:' tag and 'Cc: stable@...'?
> See https://docs.kernel.org/process/submitting-patches.html
> 
> > --- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> > +++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> > @@ -2062,8 +2062,10 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,
> >  	}
> >
> >  	ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
> > -	if (ret)
> > +	if (ret) {
> >  		dev_err_probe(dev, ret, "Failed to attach bridge\n");
> > +		return ERR_PTR(ret);
> > +	}
> >
> >  	dw_dp_init_hw(dp);
> >
> 
> It could be more concise, without adding braces:
> 
> 	if (ret)
> 		return ERR_PTR(dev_err_probe(dev, ret, "Failed to attach bridge\n"));
> 
> Luca
> 
> --
> Luca Ceresoli, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Thanks, v2 is on the way.

Best regards,
Osama