From 0556915caf8cb6ccbb426d2fb9b6e6674bb86f3f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 7 Oct 2008 13:40:36 +1000 Subject: [PATCH] --- yaml --- r: 115719 b: refs/heads/master c: e7d22bc3cb57126196c4f475d4e55aa44e151784 h: refs/heads/master i: 115717: b14a9ec59ddbd936de91c5cd1fd8d969f94c2ffe 115715: f58881875352f08069de2cf8084f049aa20a6f80 115711: e281c12e6d78a68ba5311872c14802097f9980a2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4749dc81ffd1..fd65f31ec183 100644 --- 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 index 6a89449f31d1..a31ee3202f17 100644 --- 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;