diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-30 04:28:11 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-30 04:28:22 +0300 |
| commit | 988dbd25b8ae14de70d2be384f5872d6e22e3434 (patch) | |
| tree | e79e6a7eafd4f9015cc5d9182c3406926f98f94a /drivers/gpu/drm/mcde/mcde_dsi.c | |
| parent | 15d27b15de965043d6f8e23bc7f34386fcd1a772 (diff) | |
| parent | 6571a76af380290dd9a003a3bc90d4779ec4f8f8 (diff) | |
| download | linux-988dbd25b8ae14de70d2be384f5872d6e22e3434.tar.xz | |
Merge tag 'du-next-20210728' of git://linuxtv.org/pinchartl/media into drm-next
- R-Car DU shutdown fixes
- R-Car DU conversion to bridge connector helper
- Misc small fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YQGHjOSOw2G4+A3x@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/mcde/mcde_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/mcde/mcde_dsi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 34a00d7e9c38..f3644667e24f 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1052,7 +1052,6 @@ static int mcde_dsi_bridge_attach(struct drm_bridge *bridge, { struct mcde_dsi *d = bridge_to_mcde_dsi(bridge); struct drm_device *drm = bridge->dev; - int ret; if (!drm_core_check_feature(drm, DRIVER_ATOMIC)) { dev_err(d->dev, "we need atomic updates\n"); @@ -1060,13 +1059,7 @@ static int mcde_dsi_bridge_attach(struct drm_bridge *bridge, } /* Attach the DSI bridge to the output (panel etc) bridge */ - ret = drm_bridge_attach(bridge->encoder, d->bridge_out, bridge, flags); - if (ret) { - dev_err(d->dev, "failed to attach the DSI bridge\n"); - return ret; - } - - return 0; + return drm_bridge_attach(bridge->encoder, d->bridge_out, bridge, flags); } static const struct drm_bridge_funcs mcde_dsi_bridge_funcs = { |