diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-30 07:17:13 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-30 07:17:13 +0300 |
| commit | b14fd8efb4805ff9a3218ba16f99b58778c4441e (patch) | |
| tree | d07d8cfdae242b38d578cd6bf93e4dc43ea933f8 | |
| parent | c0c4249da50fc76db1012ff2cc18380624e91a59 (diff) | |
| parent | 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec (diff) | |
| download | linux-b14fd8efb4805ff9a3218ba16f99b58778c4441e.tar.xz | |
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
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.c | 2 |
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); |