diff options
author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-06-18 19:03:38 -0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:47:13 +0900 |
commit | bbceb7b89b08b43f5c0ae61b7a313a4a36d282ca (patch) | |
tree | 288e7fe39fa15ebe9e72df013d372dcae5098c39 | |
parent | 4a33fb86c102f26a501f2b6ca717a8778a8fe06a (diff) |
drm/i915: prevent possible pin leak on error path
commit ab3951eb74e7c33a2f5b7b64d72e82f1eea61571 upstream.
We should not hit this under any sane conditions, but still, this does not
looks right.
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 2f22bea9e84..fa1ada095d1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6167,7 +6167,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, default: WARN_ONCE(1, "unknown plane in flip command\n"); ret = -ENODEV; - goto err; + goto err_unpin; } ret = intel_ring_begin(ring, 4); |