瀏覽代碼

drm/i915: fix unpaired i915 device mutex on entervt failure.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Wu Fengguang 16 年之前
父節點
當前提交
d816f6ac4f
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/gpu/drm/i915/i915_gem.c

+ 3 - 1
drivers/gpu/drm/i915/i915_gem.c

@@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
 	dev_priv->mm.suspended = 0;
 
 	ret = i915_gem_init_ringbuffer(dev);
-	if (ret != 0)
+	if (ret != 0) {
+		mutex_unlock(&dev->struct_mutex);
 		return ret;
+	}
 
 	spin_lock(&dev_priv->mm.active_list_lock);
 	BUG_ON(!list_empty(&dev_priv->mm.active_list));