Skip to content

Commit fe6d29b

Browse files
Liu Yinglucaceresoli
authored andcommitted
drm/bridge: imx8qxp-pixel-combiner: Fix bailout for imx8qxp_pc_bridge_probe()
In case the channel0 is unavailable and bailing out from free_child is needed when we fail to add a DRM bridge for the available channel1, pointer pc->ch[0] in the bailout path would be NULL and it would be dereferenced as pc->ch[0]->bridge.next_bridge. Fix this by checking pc->ch[0] before dereferencing it. Fixes: ae754f0 ("drm/bridge: imx8qxp-pixel-combiner: get/put the next bridge") Fixes: 9976459 ("drm/bridge: imx8qxp-pixel-combiner: convert to devm_drm_bridge_alloc() API") Signed-off-by: Liu Ying <victor.liu@nxp.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Link: https://patch.msgid.link/20260123-imx8qxp-drm-bridge-fixes-v1-3-8bb85ada5866@nxp.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
1 parent 45c0a8a commit fe6d29b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static int imx8qxp_pc_bridge_probe(struct platform_device *pdev)
348348
free_child:
349349
of_node_put(child);
350350

351-
if (i == 1 && pc->ch[0]->bridge.next_bridge)
351+
if (i == 1 && pc->ch[0] && pc->ch[0]->bridge.next_bridge)
352352
drm_bridge_remove(&pc->ch[0]->bridge);
353353

354354
pm_runtime_disable(dev);

0 commit comments

Comments
 (0)