diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-20 09:53:35 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-21 03:13:44 +0100 |
| commit | fc2d2bc1f1f8d8351f884bb65b5cc4ad2411b2a7 (patch) | |
| tree | 11aeddc74d23a1c5f3849855486658e3e14366dc /drivers/gpu/drm/drm_atomic.c | |
| parent | drm/gem: Warn on illegal use of the dumb buffer interface v2 (diff) | |
| download | linux-fc2d2bc1f1f8d8351f884bb65b5cc4ad2411b2a7.tar.xz linux-fc2d2bc1f1f8d8351f884bb65b5cc4ad2411b2a7.zip | |
drm/atomic: Add missing ERR_PTR casting
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>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 3624632084e2..d3b46746b611 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -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]) |