5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Krummenacher max.krummenacher@toradex.com
This reverts commit ef4a40953c8076626875ff91c41e210fcee7a6fd which is commit d89078c37b10f05fa4f4791b71db2572db361b68 upstream.
The commit was applied to make further commits apply cleanly, but the commit depends on other commits in the same patchset. I.e. the controlling DSI host would need a change too. Thus one would need to backport the full patchset changing the DSI hosts and all downstream DSI device drivers.
Revert the commit and fix up the conflicts with the backported fixes to the lt8912b driver.
Signed-off-by: Max Krummenacher max.krummenacher@toradex.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/gpu/drm/bridge/lontium-lt8912b.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
--- a/drivers/gpu/drm/bridge/lontium-lt8912b.c +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c @@ -571,6 +571,10 @@ static int lt8912_bridge_attach(struct d if (ret) goto error;
+ ret = lt8912_attach_dsi(lt); + if (ret) + goto error; + return 0;
error: @@ -726,15 +730,8 @@ static int lt8912_probe(struct i2c_clien
drm_bridge_add(<->bridge);
- ret = lt8912_attach_dsi(lt); - if (ret) - goto err_attach; - return 0;
-err_attach: - drm_bridge_remove(<->bridge); - lt8912_free_i2c(lt); err_i2c: lt8912_put_dt(lt); err_dt_parse: