Skip to content

Commit b14fd8e

Browse files
committed
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
2 parents c0c4249 + 747e5a5 commit b14fd8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/arm/hdlcd_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ static int hdlcd_drm_bind(struct device *dev)
375375

376376
err_fbdev:
377377
drm_kms_helper_poll_fini(drm);
378-
drm_mode_config_cleanup(drm);
379378
drm_vblank_cleanup(drm);
380379
err_vblank:
381380
pm_runtime_disable(drm->dev);
@@ -387,6 +386,7 @@ static int hdlcd_drm_bind(struct device *dev)
387386
drm_irq_uninstall(drm);
388387
of_reserved_mem_device_release(drm->dev);
389388
err_free:
389+
drm_mode_config_cleanup(drm);
390390
dev_set_drvdata(dev, NULL);
391391
drm_dev_unref(drm);
392392

0 commit comments

Comments
 (0)