Skip to contentSkip to conversation

drm/bridge: chipone-icn6211: remove bridge when chipone_dsi_host_attach fails

PATCH In review Osama Abdelkader 2 participants 2 messages Apr 10 – Apr 14

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/bridge: chipone-icn6211: remove bridge when chipone_dsi_host_attach fails

when chipone_dsi_host_attach fails in chipone_i2c_probe remove drm bridge before return

---
 drivers/gpu/drm/bridge/chipone-icn6211.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/chipone-icn6211.c +4 -1
index 814713c5bea9..5bee10c64265 100644
@@ -760,7 +760,10 @@ static int chipone_i2c_probe(struct i2c_client *client)
 
 	drm_bridge_add(&icn->bridge);
 
-	return chipone_dsi_host_attach(icn);
+	ret = chipone_dsi_host_attach(icn);
+	if (ret)
+		drm_bridge_remove(&icn->bridge);
+	return ret;
 }
 
 static void chipone_dsi_remove(struct mipi_dsi_device *dsi)
Signature · 1 line
2.43.0
reviewer
#1 lore raw
Quoted 13 lines · Osama Abdelkader

when chipone_dsi_host_attach fails in chipone_i2c_probe remove drm bridge before return

---
 drivers/gpu/drm/bridge/chipone-icn6211.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/chipone-icn6211.c +0 -0
index 814713c5bea9..5bee10c64265 100644

drivers/gpu/drm/bridge/chipone-icn6211.c static int chipone_i2c_probe(struct i2c_client *client) · line 767

Quoted 9 lines
drivers/gpu/drm/bridge/chipone-icn6211.c +4 -1
@@ -760,7 +760,10 @@ static int chipone_i2c_probe(struct i2c_client *client)
 
 	drm_bridge_add(&icn->bridge);
 
-	return chipone_dsi_host_attach(icn);
+	ret = chipone_dsi_host_attach(icn);
+	if (ret)
+		drm_bridge_remove(&icn->bridge);
+	return ret;
 }

You can simply switch to devm_drm_bridge_add().

Luca

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