[PATCH 2/2] staging: android: ion: One function call less in ion_buffer_create() after error detection

SF Markus Elfring elfring at users.sourceforge.net
Thu Nov 27 14:25:43 UTC 2014


>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index df12cc3..7a26b85 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -226,7 +226,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
>>  		buffer->pages = vmalloc(sizeof(struct page *) * num_pages);
>>  		if (!buffer->pages) {
>>  			ret = -ENOMEM;
>> -			goto err1;
>> +			goto err2;
>>  		}
>>  
>>  		for_each_sg(table->sgl, sg, table->nents, i) {
>> @@ -262,7 +262,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
>>  err:
>>  	heap->ops->unmap_dma(heap, buffer);
>>  	heap->ops->free(buffer);
>> -err1:
>>  	vfree(buffer->pages);
>>  err2:
> 
> Now we have "err" and "err2", which doesn't make much sense,
> please fix up.

How do you want this source code to be improved?
Should I introduce longer names for the affected jump labels?

Regards,
Markus


More information about the devel mailing list