Commit 056be396 authored by Greg Hackmann's avatar Greg Hackmann Committed by Greg Kroah-Hartman
Browse files

gpu: ion: fill in buffer->{dev,size} before mapping new buffers 



At least one map_dma() implementation (EXYNOS_CONTIG) assumes the fields
are filled in

Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce1f147a

drivers/staging/android/ion/ion.c

+3 −2
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
		return ERR_PTR(ret);

	}



	buffer->dev = dev;

	buffer->size = len;



	table = buffer->heap->ops->map_dma(buffer->heap, buffer);

	if (IS_ERR_OR_NULL(table)) {

		heap->ops->free(buffer);
@@ -159,8 +162,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
	}

	buffer->sg_table = table;



	buffer->dev = dev;

	buffer->size = len;

	mutex_init(&buffer->lock);

	ion_buffer_add(dev, buffer);

	return buffer;