Merge tag 'sti-drm-next-2017-01-06' of https://github.com/vinceab/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / sti / sti_hdmi.c

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 9c0025e9699e58c3376d344800a0cec9192d99c3..5ef1d1fce6d130139becb2df3d028396fc5bf4a9 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1305,9 +1305,8 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
 
        bridge->driver_private = hdmi;
        bridge->funcs = &sti_hdmi_bridge_funcs;
-       drm_bridge_attach(drm_dev, bridge);
+       drm_bridge_attach(encoder, bridge, NULL);
 
-       encoder->bridge = bridge;
        connector->encoder = encoder;
 
        drm_connector = (struct drm_connector *)connector;