drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe

osamakader · lucaceresoli · commit 73d01051e804 · 2026-05-19T10:14:06.000+02:00
Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe. Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com> Fixes: 8dde6f7 ("drm: bridge: icn6211: Add I2C configuration support") Cc: stable@vger.kernel.org Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Link: https://patch.msgid.link/20260430194944.78119-1-osama.abdelkader@gmail.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
@@ -758,7 +758,9 @@ static int chipone_i2c_probe(struct i2c_client *client)
 	dev_set_drvdata(dev, icn);
 	i2c_set_clientdata(client, icn);
 
-	drm_bridge_add(&icn->bridge);
+	ret = devm_drm_bridge_add(dev, &icn->bridge);
+	if (ret)
+		return ret;
 
 	return chipone_dsi_host_attach(icn);
 }

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,9 @@ static int chipone_i2c_probe(struct i2c_client *client)`
`758`	`758`	`dev_set_drvdata(dev, icn);`
`759`	`759`	`i2c_set_clientdata(client, icn);`
`760`	`760`
`761`		`- drm_bridge_add(&icn->bridge);`
	`761`	`+ ret = devm_drm_bridge_add(dev, &icn->bridge);`
	`762`	`+ if (ret)`
	`763`	`+ return ret;`
`762`	`764`
`763`	`765`	`return chipone_dsi_host_attach(icn);`
`764`	`766`	`}`