Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5476f850 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Remove extra error state NULL 



Not only was there an extra, but since we now kzalloc the error state,
we don't need either.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 165e901c

drivers/gpu/drm/i915/i915_irq.c

+0 −6
Original line number Diff line number Diff line
@@ -1931,10 +1931,6 @@ static void i915_capture_error_state(struct drm_device *dev) 
	i915_gem_record_fences(dev, error);

	i915_gem_record_rings(dev, error);



	/* Record buffers on the active and pinned lists. */

	error->active_bo = NULL;

	error->pinned_bo = NULL;



	i = 0;

	list_for_each_entry(obj, &dev_priv->mm.active_list, mm_list)

		i++;
@@ -1944,8 +1940,6 @@ static void i915_capture_error_state(struct drm_device *dev) 
			i++;

	error->pinned_bo_count = i - error->active_bo_count;



	error->active_bo = NULL;

	error->pinned_bo = NULL;

	if (i) {

		error->active_bo = kmalloc(sizeof(*error->active_bo)*i,

					   GFP_ATOMIC);