summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/omap_crtc.c
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2015-10-28 14:00:42 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-03-03 17:36:41 +0200
commita7696ea7402fc8140f2023821e60adcf406679fe (patch)
treee885d89e08677b0c5dbd86b51913c1ac046a3706 /drivers/gpu/drm/omapdrm/omap_crtc.c
parent8e54adfd9ccda87bb3d1c7e164029c8ebfa2c255 (diff)
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 <jsarha@ti.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_crtc.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c4
1 files 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);
}