From: Daniel Vetter Date: Tue, 12 Feb 2013 14:36:03 +0000 (+0100) Subject: drm/i915: remove bogus mutex_unlock from error-path X-Git-Tag: next-20130220~64^2~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=adf221a9707a33cd953fac5347bce5ceae569651;p=karo-tx-linux.git drm/i915: remove bogus mutex_unlock from error-path This has been lost in the locking rework for intel_alloc_context_page: commit 2c34b850ee1e9f86b41706149d0954eee58757a3 Author: Ben Widawsky Date: Sat Mar 19 18:14:26 2011 -0700 drm/i915: fix ilk rc6 teardown locking Cc: Ben Widawsky Reviewed-by: Ben Widawsky Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3bcc7451e0dc..61fee7fcdc2c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2289,7 +2289,6 @@ err_unpin: i915_gem_object_unpin(ctx); err_unref: drm_gem_object_unreference(&ctx->base); - mutex_unlock(&dev->struct_mutex); return NULL; }