From: Christophe JAILLET Date: Mon, 12 Mar 2018 20:15:08 +0000 (+0100) Subject: drm/meson: Fix an un-handled error path in 'meson_drv_bind_master()' X-Git-Tag: microblaze-v4.18-rc1~5^2~5^2~54 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=e770f6bf18182bc3af6ceec30189b6c323cbc157;p=linux-2.6-microblaze.git drm/meson: Fix an un-handled error path in 'meson_drv_bind_master()' 'drm_vblank_init()' can fail. So handle this (unlikely) error. Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Christophe JAILLET Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/6cbf3d70ac3904489c7194c895225c4103aebb96.1520885192.git.christophe.jaillet@wanadoo.fr --- diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index f9ad0e960263..02b0886debc0 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -222,7 +222,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->vsync_irq = platform_get_irq(pdev, 0); - drm_vblank_init(drm, 1); + ret = drm_vblank_init(drm, 1); + if (ret) + goto free_drm; + drm_mode_config_init(drm); drm->mode_config.max_width = 3840; drm->mode_config.max_height = 2160;