Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188967
b: refs/heads/master
c: 915a428
h: refs/heads/master
i:
  188965: 52874fe
  188963: 97c8210
  188959: df626b4
v: v3
  • Loading branch information
Dan Carpenter authored and Eric Anholt committed Mar 17, 2010
1 parent 9bcdd77 commit ccface7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1f2b10131f83f7caa67bf1273cec126b4283015d
refs/heads/master: 915a428e43acfd05e4ffeaf40549b0cf163eebe2
13 changes: 9 additions & 4 deletions trunk/drivers/gpu/drm/i915/intel_overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -1068,14 +1068,18 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,

drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id,
DRM_MODE_OBJECT_CRTC);
if (!drmmode_obj)
return -ENOENT;
if (!drmmode_obj) {
ret = -ENOENT;
goto out_free;
}
crtc = to_intel_crtc(obj_to_crtc(drmmode_obj));

new_bo = drm_gem_object_lookup(dev, file_priv,
put_image_rec->bo_handle);
if (!new_bo)
return -ENOENT;
if (!new_bo) {
ret = -ENOENT;
goto out_free;
}

mutex_lock(&dev->mode_config.mutex);
mutex_lock(&dev->struct_mutex);
Expand Down Expand Up @@ -1165,6 +1169,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
mutex_unlock(&dev->struct_mutex);
mutex_unlock(&dev->mode_config.mutex);
drm_gem_object_unreference_unlocked(new_bo);
out_free:
kfree(params);

return ret;
Expand Down

0 comments on commit ccface7

Please sign in to comment.