Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b14fd8ef authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents c0c4249d 747e5a5f

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -375,7 +375,6 @@ static int hdlcd_drm_bind(struct device *dev) 




err_fbdev:

err_fbdev:

	drm_kms_helper_poll_fini(drm);

	drm_kms_helper_poll_fini(drm);

	drm_mode_config_cleanup(drm);

	drm_vblank_cleanup(drm);

	drm_vblank_cleanup(drm);

err_vblank:

err_vblank:

	pm_runtime_disable(drm->dev);

	pm_runtime_disable(drm->dev);
@@ -387,6 +386,7 @@ static int hdlcd_drm_bind(struct device *dev) 
	drm_irq_uninstall(drm);

	drm_irq_uninstall(drm);

	of_reserved_mem_device_release(drm->dev);

	of_reserved_mem_device_release(drm->dev);

err_free:

err_free:

	drm_mode_config_cleanup(drm);

	dev_set_drvdata(dev, NULL);

	dev_set_drvdata(dev, NULL);

	drm_dev_unref(drm);

	drm_dev_unref(drm);