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

Unverified Commit 9ca86149 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Maxime Ripard
Browse files

drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()' 



Commit 070badfa ("drm/sun4i: call drm_vblank_init with correct number
of crtcs") has moved some code without updating the error handling gotos
accordingly.

Branch to the correct label and remove a now unused lablel.

Fixes: 070badfa ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180311231909.5381-1-christophe.jaillet@wanadoo.fr
parent 7035046d

drivers/gpu/drm/sun4i/sun4i_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int sun4i_drv_bind(struct device *dev) 
	/* drm_vblank_init calls kcalloc, which can fail */

	ret = drm_vblank_init(drm, drm->mode_config.num_crtc);

	if (ret)

		goto free_mem_region;

		goto cleanup_mode_config;



	drm->irq_enabled = true;
@@ -139,7 +139,6 @@ static int sun4i_drv_bind(struct device *dev) 
	sun4i_framebuffer_free(drm);

cleanup_mode_config:

	drm_mode_config_cleanup(drm);

free_mem_region:

	of_reserved_mem_device_release(dev);

free_drm:

	drm_dev_unref(drm);