---

yaml --- r: 115719 b: refs/heads/master c: e7d22bc h: refs/heads/master i: 115717: b14a9ec 115715: f588818 115711: e281c12 v: v3
git-mirror · Oct 17, 2008 · 0556915 · 0556915
1 parent 09acc80
commit 0556915
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bdf00b22154023ac312481583603f4724eb1401
+refs/heads/master: e7d22bc3cb57126196c4f475d4e55aa44e151784
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -146,6 +146,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
 	if (ret != 0) {
 		drm_gem_object_unreference(obj);
 		mutex_unlock(&dev->struct_mutex);
+		return ret;
 	}
 
 	offset = args->offset;