1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index 6902ad6da710..d6f8d5818e18 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -23,10 +23,9 @@ struct hdmi_bridge {
 };
 #define to_hdmi_bridge(x) container_of(x, struct hdmi_bridge, base)
 
-static void hdmi_bridge_destroy(struct drm_bridge *bridge)
+void hdmi_bridge_destroy(struct drm_bridge *bridge)
 {
         struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
-        drm_bridge_cleanup(bridge);
         kfree(hdmi_bridge);
 }
 
@@ -200,7 +199,6 @@ static const struct drm_bridge_funcs hdmi_bridge_funcs = {
                 .disable = hdmi_bridge_disable,
                 .post_disable = hdmi_bridge_post_disable,
                 .mode_set = hdmi_bridge_mode_set,
-                .destroy = hdmi_bridge_destroy,
 };
 
 
@@ -220,8 +218,9 @@ struct drm_bridge *hdmi_bridge_init(struct hdmi *hdmi)
         hdmi_bridge->hdmi = hdmi;
 
         bridge = &hdmi_bridge->base;
+        bridge->funcs = &hdmi_bridge_funcs;
 
-        drm_bridge_init(hdmi->dev, bridge, &hdmi_bridge_funcs);
+        drm_bridge_attach(hdmi->dev, bridge);
 
         return bridge;