aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>2016-02-25 19:52:27 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-11 22:09:09 -0800
commitdcce1c7c083d80a8230270eb264c90a8d767131f (patch)
tree0ae0c354e561ab9e0ea605ff28b41058a23e5987 /drivers/staging/android
parentstaging: android: ion: tegra: Use devm_kcalloc instead of devm_kzalloc (diff)
downloadlinux-dev-dcce1c7c083d80a8230270eb264c90a8d767131f.tar.xz
linux-dev-dcce1c7c083d80a8230270eb264c90a8d767131f.zip
staging: android: ion: tegra: Replace IS_ERR_OR_NULL with IS_ERR
Replace IS_ERR_OR_NULL test with an IS_ERR test since ion_device_create() function returns a valid device or a -PTR_ERR only as evidenced by the comment on the function prototype. Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/ion/tegra/tegra_ion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/tegra/tegra_ion.c b/drivers/staging/android/ion/tegra/tegra_ion.c
index 88285243d53d..49e55e5acead 100644
--- a/drivers/staging/android/ion/tegra/tegra_ion.c
+++ b/drivers/staging/android/ion/tegra/tegra_ion.c
@@ -37,7 +37,7 @@ static int tegra_ion_probe(struct platform_device *pdev)
sizeof(struct ion_heap *), GFP_KERNEL);
idev = ion_device_create(NULL);
- if (IS_ERR_OR_NULL(idev))
+ if (IS_ERR(idev))
return PTR_ERR(idev);
/* create the heaps as specified in the board file */