Skip to content

Commit

Permalink
Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld int…
Browse files Browse the repository at this point in the history
…o 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
  • Loading branch information
Dave Airlie committed Nov 30, 2016
2 parents c0c4249 + 747e5a5 commit b14fd8e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/arm/hdlcd_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -387,6 +386,7 @@ static int hdlcd_drm_bind(struct device *dev)
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);

Expand Down

0 comments on commit b14fd8e

Please sign in to comment.