---

yaml --- r: 157280 b: refs/heads/master c: e6890f6 h: refs/heads/master v: v3
git-mirror · Sep 9, 2009 · 3cc2f7e · 3cc2f7e
1 parent a754a67
commit 3cc2f7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8460db30dfd085ef3837c8fb02ecf2e718b983
+refs/heads/master: e6890f6f3dc2d9024a08b1a149d9bd5208eea350
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4232,15 +4232,11 @@ int
 i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv)
 {
-	int ret;
-
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		return 0;
 
-	ret = i915_gem_idle(dev);
 	drm_irq_uninstall(dev);
-
-	return ret;
+	return i915_gem_idle(dev);
 }
 
 void