| From d316825ff7dd1720cb8617433c1a0eff18907f09 Mon Sep 17 00:00:00 2001 |
| From: Eugeni Dodonov <eugeni.dodonov@intel.com> |
| Date: Mon, 18 Jun 2012 19:03:38 -0300 |
| Subject: drm/i915: prevent possible pin leak on error path |
| |
| From: Eugeni Dodonov <eugeni.dodonov@intel.com> |
| |
| 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: Julien Cristau <jcristau@debian.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -7505,7 +7505,7 @@ static int intel_gen7_queue_flip(struct |
| default: |
| WARN_ONCE(1, "unknown plane in flip command\n"); |
| ret = -ENODEV; |
| - goto err; |
| + goto err_unpin; |
| } |
| |
| ret = intel_ring_begin(ring, 4); |
