On Fri, Jul 19, 2013 at 08:46:27AM +0300, Dan Carpenter wrote: > i915_gem_vma_destroy() frees its argument so we have to move the > drm_mm_remove_node() call up a few lines. > > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Both applied, thanks for the patches. -Daniel > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 9a9a77a..f347ad5 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3161,9 +3161,9 @@ search_free: > return 0; > > err_out: > + drm_mm_remove_node(&vma->node); > i915_gem_vma_destroy(vma); > i915_gem_object_unpin_pages(obj); > - drm_mm_remove_node(&vma->node); > return ret; > } > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
