[PATCH] drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()

Laurent Pinchart laurent.pinchart at ideasonboard.com
Sun Jun 16 18:43:26 UTC 2024


On Thu, Jun 13, 2024 at 11:05:01AM -0400, Sean Anderson wrote:
> On 5/20/24 11:05, Sean Anderson wrote:
> > On 5/20/24 05:40, Christophe JAILLET wrote:
> >> If zynqmp_dpsub_drm_init() fails, we must undo the previous
> >> drm_bridge_add() call.
> >> 
> >> Fixes: be3f3042391d ("drm: zynqmp_dpsub: Always register bridge")
> >> Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
> >> ---
> >> Compile tested only
> >> ---
> >>  drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
> >>  1 file changed, 1 insertion(+)
> >> 
> >> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> index face8d6b2a6f..f5781939de9c 100644
> >> --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c
> >> @@ -269,6 +269,7 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)
> >>  	return 0;
> >>  
> >>  err_disp:
> >> +	drm_bridge_remove(dpsub->bridge);
> >>  	zynqmp_disp_remove(dpsub);
> >>  err_dp:
> >>  	zynqmp_dp_remove(dpsub);
> > 
> > Reviewed-by: Sean Anderson <sean.anderso at linux.dev>
> 
> Will this be applied soon? The patch it fixes has made its way into
> the stable tree already.

If someone can merge it in drm-misc that would be the fastest way.
Otherwise I'll send a pull request at some point, but I'm overworked at
the moment.

-- 
Regards,

Laurent Pinchart


More information about the dri-devel mailing list