diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
commit | 94ac2ab3fff96814d7460a27a0e9d004abbd4128 (patch) | |
tree | 9a4eb8cc234b540b0f4b93363109cdd37a20540b /drivers/gpu/drm/bridge/ti-dlpc3433.c | |
parent | Adding debian version 6.8.12-1. (diff) | |
download | linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.tar.xz linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.zip |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/gpu/drm/bridge/ti-dlpc3433.c')
-rw-r--r-- | drivers/gpu/drm/bridge/ti-dlpc3433.c | 17 |
1 files changed, 8 insertions, 9 deletions
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; |