Merge airlied/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / bridge / panel.c

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 67fe19e..685c1a4 100644 (file)
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -158,7 +158,6 @@ struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel,
                                        u32 connector_type)
 {
        struct panel_bridge *panel_bridge;
-       int ret;
 
        if (!panel)
                return ERR_PTR(-EINVAL);
@@ -176,9 +175,7 @@ struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel,
        panel_bridge->bridge.of_node = panel->dev->of_node;
 #endif
 
-       ret = drm_bridge_add(&panel_bridge->bridge);
-       if (ret)
-               return ERR_PTR(ret);
+       drm_bridge_add(&panel_bridge->bridge);
 
        return &panel_bridge->bridge;
 }