summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2015-03-27 15:33:51 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-27 15:06:52 +0100
commit9d918c157fc27716ca8d601745b4776a3145cc93 (patch)
treefd8dbc59345c0aa131a323255d4994114c319111 /drivers
parent9abc464854cf12273ebe66dc5e4a9d82b6e0c303 (diff)
downloadlinux-9d918c157fc27716ca8d601745b4776a3145cc93.tar.bz2
drm/i915: Handle error to get connector state when staging config
The return value of one of the calls to drm_atomic_get_connector_state() in intel_modeset_stage_output_state() wasn't checked for errors. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3852cbaf9163..75955fee6d24 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11985,6 +11985,8 @@ intel_modeset_stage_output_state(struct drm_device *dev,
for_each_intel_connector(dev, connector) {
connector_state =
drm_atomic_get_connector_state(state, &connector->base);
+ if (IS_ERR(connector_state))
+ return PTR_ERR(connector_state);
if (connector->new_encoder) {
if (connector->new_encoder != connector->encoder)