Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes

Thanks for pulling the previous patch for HDLCD. Unfortunately,
yesterday Robin Murphy discovered another issue while playing with
CMA allocation sizes, which he has submitted a fix for.

* 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld:
  drm: hdlcd: Fix cleanup order

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index fb6a418ce6be..e138fb51e8ce 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -375,7 +375,6 @@ static int hdlcd_drm_bind(struct device *dev)
 
 err_fbdev:
         drm_kms_helper_poll_fini(drm);
-        drm_mode_config_cleanup(drm);
         drm_vblank_cleanup(drm);
 err_vblank:
         pm_runtime_disable(drm->dev);
@@ -387,6 +386,7 @@ err_unload:
         drm_irq_uninstall(drm);
         of_reserved_mem_device_release(drm->dev);
 err_free:
+        drm_mode_config_cleanup(drm);
         dev_set_drvdata(dev, NULL);
         drm_dev_unref(drm);