aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-08-28 13:40:06 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-03 05:04:57 -0400
commit21386f86c9af92fea4897e90c1671b3f0010e936 (patch)
treec77d51425d2c38864ba951b09fe76b4718952778
parent1c14762d0cc3eecfdc5060bd634d124d32bd9d44 (diff)
drm/i915: trivial: remove unneed set to NULL
At this point of the code the obj var is already NULL, so we don't need to set it again to NULL. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e572ffa16a60..ebb480ff35fb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8307,7 +8307,6 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
8307 if (!obj) { 8307 if (!obj) {
8308 DRM_DEBUG_KMS("cursor off\n"); 8308 DRM_DEBUG_KMS("cursor off\n");
8309 addr = 0; 8309 addr = 0;
8310 obj = NULL;
8311 mutex_lock(&dev->struct_mutex); 8310 mutex_lock(&dev->struct_mutex);
8312 goto finish; 8311 goto finish;
8313 } 8312 }