[PATCH -next] staging: android: ion: Fix return value check in hi6220_ion_probe()

Wei Yongjun weiyj.lk at gmail.com
Thu Sep 15 02:20:43 UTC 2016

From: Wei Yongjun <weiyongjun1 at huawei.com>

In case of error, the function ion_device_create() returns ERR_PTR() and
never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().

Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
 drivers/staging/android/ion/hisilicon/hi6220_ion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/android/ion/hisilicon/hi6220_ion.c b/drivers/staging/android/ion/hisilicon/hi6220_ion.c
index f392db2..659aa71 100644
--- a/drivers/staging/android/ion/hisilicon/hi6220_ion.c
+++ b/drivers/staging/android/ion/hisilicon/hi6220_ion.c
@@ -49,8 +49,8 @@ static int hi6220_ion_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, ipdev);
 	ipdev->idev = ion_device_create(NULL);
-	if (!ipdev->idev)
-		return -ENOMEM;
+	if (IS_ERR(ipdev->idev))
+		return PTR_ERR(ipdev->idev);
 	ipdev->data = ion_parse_dt(pdev, hisi_heaps);
 	if (IS_ERR(ipdev->data))

More information about the devel mailing list