[PATCH] ion: hisilicon: check the right value after ion_heap_create

Laura Abbott labbott at redhat.com
Fri May 5 15:44:37 UTC 2017


On 05/04/2017 08:32 PM, Yisheng Xie wrote:
> Hi Laura,
> 
> On 2017/5/5 1:47, Laura Abbott wrote:
>> On 05/04/2017 07:45 AM, Yisheng Xie wrote:
>>> From: Yisheng Xie <xieyisheng1 at huawei.com>
>>>
>>> It should check ipdev->heaps[i] whether it is error or null instead of
>>> ipdev->heaps, after ion_heap_create() for ipdev->heaps[i].
>>>
>>> Signed-off-by: Yisheng Xie <xieyisheng1 at huawei.com>
>>> ---
>>>  drivers/staging/android/ion/hisilicon/hi6220_ion.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/staging/android/ion/hisilicon/hi6220_ion.c b/drivers/staging/android/ion/hisilicon/hi6220_ion.c
>>> index 0de7897..7f8eda5 100644
>>> --- a/drivers/staging/android/ion/hisilicon/hi6220_ion.c
>>> +++ b/drivers/staging/android/ion/hisilicon/hi6220_ion.c
>>> @@ -66,7 +66,7 @@ static int hi6220_ion_probe(struct platform_device *pdev)
>>>  
>>>  	for (i = 0; i < ipdev->data->nr; i++) {
>>>  		ipdev->heaps[i] = ion_heap_create(&ipdev->data->heaps[i]);
>>> -		if (!ipdev->heaps) {
>>> +		if (IS_ERR_OR_NULL(ipdev->heaps[i])) {
>>>  			ion_destroy_platform_data(ipdev->data);
>>>  			return -ENOMEM;
>>>  		}
>>>
>>
>> This file was removed in a recent clean up series.
> I see, but maybe you should clean up more totally, I mean you should also
> remove ./drivers/staging/android/ion/devicetree.txt for it is also useless.
> 
> Thanks
> Yisheng Xie
> 

Thanks for letting me know. Feel free to submit a patch to remove it.

Thanks,
Laura



More information about the devel mailing list