On Sun, 2008-12-21 at 16:28 +0100, Julia Lawall wrote: > From: Julia Lawall <julia@xxxxxxx> > > object_list is checked to be not NULL near the beginning of the function and > is not updated subsequently. > > A simplified version of the semantic patch that makes this change is as > follows: (http://www.emn.fr/x-info/coccinelle/) > > // <smpl> Committed. Thanks! > --- > drivers/gpu/drm/i915/i915_gem.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index fccf199..78319ec 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2611,13 +2611,12 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, > "back to user (%d)\n", > args->buffer_count, ret); > err: > - if (object_list != NULL) { > - for (i = 0; i < pinned; i++) > - i915_gem_object_unpin(object_list[i]); > + for (i = 0; i < pinned; i++) > + i915_gem_object_unpin(object_list[i]); > + > + for (i = 0; i < args->buffer_count; i++) > + drm_gem_object_unreference(object_list[i]); > > - for (i = 0; i < args->buffer_count; i++) > - drm_gem_object_unreference(object_list[i]); > - } > mutex_unlock(&dev->struct_mutex); > > pre_mutex_err: > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Eric Anholt eric@xxxxxxxxxx eric.anholt@xxxxxxxxx
Attachment:
signature.asc
Description: This is a digitally signed message part
