drm/i915: prevent possible pin leak on error path
authorEugeni Dodonov <eugeni.dodonov@intel.com>
Mon, 18 Jun 2012 22:03:38 +0000 (19:03 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 26 Jul 2012 20:32:29 +0000 (22:32 +0200)
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>
drivers/gpu/drm/i915/intel_display.c

index 17020cdff338e7ae04e25ac3a89f483cf7745209..2e1f28f38ee92ac0987e120232a679be6e3ba933 100644 (file)
@@ -6317,7 +6317,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);