aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-03-23 00:38:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-22 22:27:36 -0400
commitccbc2a9e7878ff09bcaed4893c2a2d3adbb797e2 (patch)
tree1a4bbbcdac4d2648234d23a7d33bd50b03c37a98 /drivers/staging
parentstaging: wilc1000: fix a couple of memory leaks (diff)
downloadlinux-dev-ccbc2a9e7878ff09bcaed4893c2a2d3adbb797e2.tar.xz
linux-dev-ccbc2a9e7878ff09bcaed4893c2a2d3adbb797e2.zip
staging: android: ion_test: fix check of platform_device_register_simple() error code
On error platform_device_register_simple() returns ERR_PTR() value, check for NULL always fails. The change corrects the check itself and propagates the returned error upwards. Fixes: 81fb0b901397 ("staging: android: ion_test: unregister the platform device") Cc: stable <stable@vger.kernel.org> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/android/ion/ion_test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion_test.c b/drivers/staging/android/ion/ion_test.c
index da34bc12cd7c..83a3af06d01c 100644
--- a/drivers/staging/android/ion/ion_test.c
+++ b/drivers/staging/android/ion/ion_test.c
@@ -285,8 +285,8 @@ static int __init ion_test_init(void)
{
ion_test_pdev = platform_device_register_simple("ion-test",
-1, NULL, 0);
- if (!ion_test_pdev)
- return -ENODEV;
+ if (IS_ERR(ion_test_pdev))
+ return PTR_ERR(ion_test_pdev);
return platform_driver_probe(&ion_test_platform_driver, ion_test_probe);
}