From e54def4ad8144ab15f826416e2e0f290ef1901b4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 23:00:30 +0200 Subject: Adding upstream version 6.9.2. Signed-off-by: Daniel Baumann --- drivers/gpu/drm/bridge/ti-dlpc3433.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/drm/bridge/ti-dlpc3433.c') diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c index 6b559e0713..ca3348109b 100644 --- a/drivers/gpu/drm/bridge/ti-dlpc3433.c +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c @@ -319,11 +319,12 @@ static int dlpc_host_attach(struct dlpc *dlpc) .channel = 0, .node = NULL, }; - int ret; host = of_find_mipi_dsi_host_by_node(dlpc->host_node); - if (!host) - return dev_err_probe(dev, -EPROBE_DEFER, "failed to find dsi host\n"); + if (!host) { + DRM_DEV_ERROR(dev, "failed to find dsi host\n"); + return -EPROBE_DEFER; + } dlpc->dsi = mipi_dsi_device_register_full(host, &info); if (IS_ERR(dlpc->dsi)) { @@ -335,11 +336,7 @@ static int dlpc_host_attach(struct dlpc *dlpc) dlpc->dsi->format = MIPI_DSI_FMT_RGB565; dlpc->dsi->lanes = dlpc->dsi_lanes; - ret = devm_mipi_dsi_attach(dev, dlpc->dsi); - if (ret) - DRM_DEV_ERROR(dev, "failed to attach dsi host\n"); - - return ret; + return devm_mipi_dsi_attach(dev, dlpc->dsi); } static int dlpc3433_probe(struct i2c_client *client) @@ -370,8 +367,10 @@ static int dlpc3433_probe(struct i2c_client *client) drm_bridge_add(&dlpc->bridge); ret = dlpc_host_attach(dlpc); - if (ret) + if (ret) { + DRM_DEV_ERROR(dev, "failed to attach dsi host\n"); goto err_remove_bridge; + } return 0; -- cgit v1.2.3