From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671AbdEDPUD (ORCPT ); Thu, 4 May 2017 11:20:03 -0400 Received: from smtpproxy11.qq.com ([183.62.126.200]:54757 "EHLO smtpproxy11.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbdEDPTO (ORCPT ); Thu, 4 May 2017 11:19:14 -0400 X-Greylist: delayed 987 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 May 2017 11:19:13 EDT X-QQ-mid: esmtp27t1493909135tgga0qhuk X-QQ-SSF: 01000000000000509G100300000000V X-QQ-FEAT: EFHTda39HAQQBCzzUEIVJTYV+rrJCkEfxKPRlB0jCd3nfBJI+4dyGMnsl+ja6 MjfGiutkXxSGabXPpO/ME7P5AkOmbBkPL89335ipXnboSf9jXzdz8YtfqE8tQHBTBM52pyH ySv1Qa3q4mTZOIozm9dFSeVSVNDRdalE5UYy57SpYDD61HCdBVkfTs/eY5kFTfe1+ltkMWl /jDMRWGbBpi2Bc6d75sWu42MV2FD7o6//MFjXjX7Uf1x8pO11rgB+mSmxjGfuNW4QidtlnP DGfL+sBbExogkn X-QQ-GoodBg: 0 From: Yisheng Xie To: labbott@redhat.com, sumit.semwal@linaro.org, gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, wporter82@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] ion: hisilicon: check the right value after ion_heap_create Date: Thu, 4 May 2017 22:45:33 +0800 Message-Id: <1493909133-3868-1-git-send-email-ysxie@foxmail.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign1 X-QQ-Bgrelay: 1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yisheng Xie 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 --- 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; } -- 1.9.1