From: Dave Airlie <airlied@redhat.com>
Date: Wed, 16 Nov 2016 22:55:26 +0000 (+1000)
Subject: Merge branch 'drm-tda998x-mali' of git://git.armlinux.org.uk/~rmk/linux-arm into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25bfe018c1c57955e763ebfa2c1fa54283e426e9;p=linux-beck.git

Merge branch 'drm-tda998x-mali' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next

Fix conncector registration with tda998x.

* 'drm-tda998x-mali' of git://git.armlinux.org.uk/~rmk/linux-arm:
  drm/i2c: tda998x: mali-dp: hdlcd: refactor connector registration
---

25bfe018c1c57955e763ebfa2c1fa54283e426e9
diff --cc drivers/gpu/drm/arm/malidp_drv.c
index ebf90c794eab,79bfc1360a1b..32f746e31379
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@@ -415,9 -413,8 +421,7 @@@ bind_fail
  	of_node_put(malidp->crtc.port);
  	malidp->crtc.port = NULL;
  port_fail:
- 	drm_dev_unregister(drm);
- register_fail:
 -	malidp_de_planes_destroy(drm);
 -	drm_mode_config_cleanup(drm);
 +	malidp_fini(drm);
  init_fail:
  	drm->dev_private = NULL;
  	dev_set_drvdata(dev, NULL);
@@@ -449,8 -447,8 +454,7 @@@ static void malidp_unbind(struct devic
  	component_unbind_all(dev, drm);
  	of_node_put(malidp->crtc.port);
  	malidp->crtc.port = NULL;
- 	drm_dev_unregister(drm);
 -	malidp_de_planes_destroy(drm);
 -	drm_mode_config_cleanup(drm);
 +	malidp_fini(drm);
  	drm->dev_private = NULL;
  	dev_set_drvdata(dev, NULL);
  	clk_disable_unprepare(hwdev->mclk);