Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux into drm...

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

diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index a5979cd25cc7d8264b9bc9edd462bbb1a31a8e53..b08376b7611b896fbcb8fd6b3e91fe44dd4b7015 100644 (file)
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -387,7 +387,9 @@ sti_dvo_connector_detect(struct drm_connector *connector, bool force)
 
        if (!dvo->panel) {
                dvo->panel = of_drm_find_panel(dvo->panel_node);
-               if (dvo->panel)
+               if (IS_ERR(dvo->panel))
+                       dvo->panel = NULL;
+               else
                        drm_panel_attach(dvo->panel, connector);
        }
 
@@ -484,7 +486,7 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
        drm_connector_helper_add(drm_connector,
                                 &sti_dvo_connector_helper_funcs);
 
-       err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+       err = drm_connector_attach_encoder(drm_connector, encoder);
        if (err) {
                DRM_ERROR("Failed to attach a connector to a encoder\n");
                goto err_sysfs;