diff options
author | Dave Airlie <airlied@redhat.com> | 2010-10-05 21:10:48 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-05 21:10:48 -0400 |
commit | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch) | |
tree | 80b4a779130a477680a72109257fb8c19d66cf22 /drivers/gpu/drm/i915/i915_gem.c | |
parent | 9a170caed6fce89da77852575a7eee7dbadee332 (diff) | |
parent | abb295f3b3db602f91accf58b526b30b48673af1 (diff) |
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
necessary for some of the vmware fixes to be pushed in.
Conflicts:
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/i915/intel_fb.c
include/drm/drmP.h
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 29e97c075421..100a7537980e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -244,14 +244,12 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, | |||
244 | return -ENOMEM; | 244 | return -ENOMEM; |
245 | 245 | ||
246 | ret = drm_gem_handle_create(file_priv, obj, &handle); | 246 | ret = drm_gem_handle_create(file_priv, obj, &handle); |
247 | /* drop reference from allocate - handle holds it now */ | ||
248 | drm_gem_object_unreference_unlocked(obj); | ||
247 | if (ret) { | 249 | if (ret) { |
248 | drm_gem_object_unreference_unlocked(obj); | ||
249 | return ret; | 250 | return ret; |
250 | } | 251 | } |
251 | 252 | ||
252 | /* Sink the floating reference from kref_init(handlecount) */ | ||
253 | drm_gem_object_handle_unreference_unlocked(obj); | ||
254 | |||
255 | args->handle = handle; | 253 | args->handle = handle; |
256 | return 0; | 254 | return 0; |
257 | } | 255 | } |