projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7035046
)
drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()'
author
Christophe JAILLET
<
[email protected]
>
Sun, 11 Mar 2018 23:19:09 +0000
(
00:19
+0100)
committer
Maxime Ripard
<
[email protected]
>
Mon, 12 Mar 2018 09:42:09 +0000
(10:42 +0100)
Commit
070badfab767
("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: 070badfab767 ("drm/sun4i: call drm_vblank_init with correct number of crtcs")
Signed-off-by: Christophe JAILLET <
[email protected]
>
Signed-off-by: Maxime Ripard <
[email protected]
>
Link:
https://patchwork.freedesktop.org/patch/msgid/
[email protected]
drivers/gpu/drm/sun4i/sun4i_drv.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/sun4i/sun4i_drv.c
b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 4570da0227b4e49523b7f9c697fce54777dacd7e..d9a71f361b1440fd6a84c4dcbd9f295c7e873a39 100644
(file)
--- a/
drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/
drivers/gpu/drm/sun4i/sun4i_drv.c
@@
-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
@@
finish_poll:
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);