drm/atomic: Add missing ERR_PTR casting
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 20 Nov 2014 08:53:35 +0000 (09:53 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Nov 2014 02:13:44 +0000 (12:13 +1000)
This is an oversight from

commit f52b69f1ecfdd7ef6867a257620258c09e569552
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Nov 19 18:38:08 2014 +0100

    drm/atomic: Don't overrun the connector array when hotplugging

Cc: Dave Airlie <airlied@redhat.com>
Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_atomic.c

index 3624632084e26daeb8fa4210b9460d0b056ee425..d3b46746b611a84a56432f80e608e61d7e5b4203 100644 (file)
@@ -318,7 +318,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
         */
        if (index >= state->num_connector) {
                DRM_DEBUG_KMS("Hot-added connector would overflow state array, restarting\n");
-               return -EAGAIN;
+               return ERR_PTR(-EAGAIN);
        }
 
        if (state->connector_states[index])