Revert "drm/i2c: tda998x: don't register the connector"

This reverts commit 6a2925ea12006911c8180a89feda6d040873ed18.

commit 6a2925ea12006911c8180a89feda6d040873ed18
Author: Brian Starkey <brian.starkey@arm.com>
Date:   Mon Jul 25 11:55:48 2016 +0100

    drm/i2c: tda998x: don't register the connector

[seanpaul]
Patch isn't fully baked, and still causing problems. Revert
until this is sorted.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 088900d78ceb5c2946705c4252d3f5ec296a01ce..9798d400d8174750522b1704be66364fe9425318 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1584,6 +1584,7 @@ const struct drm_connector_helper_funcs tda998x_connector_helper_funcs = {
 
 static void tda998x_connector_destroy(struct drm_connector *connector)
 {
+       drm_connector_unregister(connector);
        drm_connector_cleanup(connector);
 }
 
@@ -1655,10 +1656,16 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data)
        if (ret)
                goto err_connector;
 
+       ret = drm_connector_register(&priv->connector);
+       if (ret)
+               goto err_sysfs;
+
        drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
 
        return 0;
 
+err_sysfs:
+       drm_connector_cleanup(&priv->connector);
 err_connector:
        drm_encoder_cleanup(&priv->encoder);
 err_encoder:
@@ -1671,6 +1678,7 @@ static void tda998x_unbind(struct device *dev, struct device *master,
 {
        struct tda998x_priv *priv = dev_get_drvdata(dev);
 
+       drm_connector_unregister(&priv->connector);
        drm_connector_cleanup(&priv->connector);
        drm_encoder_cleanup(&priv->encoder);
        tda998x_destroy(priv);