Skip to content

Commit

Permalink
drm/i915: check for return value
Browse files Browse the repository at this point in the history
We were not checking the return value of drm_encoder_init() which can
fail. And if it fails then we will be working with an uninitialized
encoder.

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com
  • Loading branch information
Sudip Mukherjee authored and Daniel Vetter committed Dec 9, 2015
1 parent 506a8e8 commit 893da0c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -5987,8 +5987,9 @@ intel_dp_init(struct drm_device *dev,
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;

drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
DRM_MODE_ENCODER_TMDS);
if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
DRM_MODE_ENCODER_TMDS))
goto err_encoder_init;

intel_encoder->compute_config = intel_dp_compute_config;
intel_encoder->disable = intel_disable_dp;
Expand Down Expand Up @@ -6037,6 +6038,7 @@ intel_dp_init(struct drm_device *dev,

err_init_connector:
drm_encoder_cleanup(encoder);
err_encoder_init:
kfree(intel_connector);
err_connector_alloc:
kfree(intel_dig_port);
Expand Down

0 comments on commit 893da0c

Please sign in to comment.