diff options
author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-06-18 18:03:38 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-26 16:32:29 -0400 |
commit | ab3951eb74e7c33a2f5b7b64d72e82f1eea61571 (patch) | |
tree | 02b23adccf278c76a86c4d76fd75208c10a2ea22 /drivers/gpu/drm/i915/intel_display.c | |
parent | acbe9475505de68540fab8653131d41d424c4fa3 (diff) |
drm/i915: prevent possible pin leak on error path
We should not hit this under any sane conditions, but still, this does not
looks right.
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
CC: stable@vger.kernel.org
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Reviewed-by: Chris Wlison <chris@chris-wilson.co.uk>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 17020cdff338..2e1f28f38ee9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -6317,7 +6317,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, | |||
6317 | default: | 6317 | default: |
6318 | WARN_ONCE(1, "unknown plane in flip command\n"); | 6318 | WARN_ONCE(1, "unknown plane in flip command\n"); |
6319 | ret = -ENODEV; | 6319 | ret = -ENODEV; |
6320 | goto err; | 6320 | goto err_unpin; |
6321 | } | 6321 | } |
6322 | 6322 | ||
6323 | ret = intel_ring_begin(ring, 4); | 6323 | ret = intel_ring_begin(ring, 4); |