From a7696ea7402fc8140f2023821e60adcf406679fe Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Wed, 28 Oct 2015 14:00:42 +0200 Subject: [PATCH] drm/omap: drm_atomic_get_plane_state() may return ERR_PTR drm_atomic_get_plane_state() may return ERR_PTR. Handle drm_atomic_get_plane_state() return values right in omap_crtc_atomic_set_property(). Signed-off-by: Jyri Sarha Acked-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 7dd3d44a93e5..f5b19d18fa8b 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -433,8 +433,8 @@ static int omap_crtc_atomic_set_property(struct drm_crtc *crtc, */ plane_state = drm_atomic_get_plane_state(state->state, plane); - if (!plane_state) - return -EINVAL; + if (IS_ERR(plane_state)) + return PTR_ERR(plane_state); return drm_atomic_plane_set_property(plane, plane_state, property, val); } -- 2.39.2