diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-30 11:28:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-30 11:28:22 +1000 |
| commit | 988dbd25b8ae14de70d2be384f5872d6e22e3434 (patch) | |
| tree | e79e6a7eafd4f9015cc5d9182c3406926f98f94a /drivers/gpu/drm/omapdrm/omap_drv.c | |
| parent | 15d27b15de965043d6f8e23bc7f34386fcd1a772 (diff) | |
| parent | 6571a76af380290dd9a003a3bc90d4779ec4f8f8 (diff) | |
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/omapdrm/omap_drv.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 8632139e0f01..f86e20578143 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -290,12 +290,8 @@ static int omap_modeset_init(struct drm_device *dev) ret = drm_bridge_attach(pipe->encoder, pipe->output->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); - if (ret < 0) { - dev_err(priv->dev, - "unable to attach bridge %pOF\n", - pipe->output->bridge->of_node); + if (ret < 0) return ret; - } } id = omap_display_id(pipe->output); |