Skip to content

Commit e770f6b

Browse files
tititiou36superna9999
authored andcommitted
drm/meson: Fix an un-handled error path in 'meson_drv_bind_master()'
'drm_vblank_init()' can fail. So handle this (unlikely) error. Fixes: bbbe775 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Christophe JAILLET <[email protected]> Acked-by: Neil Armstrong <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/6cbf3d70ac3904489c7194c895225c4103aebb96.1520885192.git.christophe.jaillet@wanadoo.fr
1 parent c10496c commit e770f6b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/meson/meson_drv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
222222

223223
priv->vsync_irq = platform_get_irq(pdev, 0);
224224

225-
drm_vblank_init(drm, 1);
225+
ret = drm_vblank_init(drm, 1);
226+
if (ret)
227+
goto free_drm;
228+
226229
drm_mode_config_init(drm);
227230
drm->mode_config.max_width = 3840;
228231
drm->mode_config.max_height = 2160;

0 commit comments

Comments
 (0)