From: Sean Paul Date: Fri, 23 Sep 2016 07:07:52 +0000 (-0700) Subject: Revert "drm/i2c: tda998x: don't register the connector" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f67ed574946a7385c8034652c9e79abf00beadeb;p=linux-beck.git Revert "drm/i2c: tda998x: don't register the connector" This reverts commit 6a2925ea12006911c8180a89feda6d040873ed18. commit 6a2925ea12006911c8180a89feda6d040873ed18 Author: Brian Starkey 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 Signed-off-by: Sean Paul --- diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 088900d78ceb..9798d400d817 100644 --- 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);