aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_crtc.c
diff options
context:
space:
mode:
authorJyri Sarha <[email protected]>2015-10-28 12:00:42 +0000
committerTomi Valkeinen <[email protected]>2016-03-03 15:36:41 +0000
commita7696ea7402fc8140f2023821e60adcf406679fe (patch)
treee885d89e08677b0c5dbd86b51913c1ac046a3706 /drivers/gpu/drm/omapdrm/omap_crtc.c
parentdrm/omap: add dmm_read() and dmm_write() wrappers (diff)
downloadkernel-a7696ea7402fc8140f2023821e60adcf406679fe.tar.gz
kernel-a7696ea7402fc8140f2023821e60adcf406679fe.zip
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 <[email protected]> Acked-by: Tomi Valkeinen <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]>
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);
}