]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iio: adc: mxs-lradc: Fix return value check in mxs_lradc_adc_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Tue, 16 May 2017 15:26:12 +0000 (15:26 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sat, 3 Jun 2017 09:52:31 +0000 (10:52 +0100)
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test. Also add NULL test for iores.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/adc/mxs-lradc-adc.c

index b0c7d8ee5cb8d859d683b2b0aca40ef5999d2546..6888167ca1e6cb65ab926b36fe8199684a00527d 100644 (file)
@@ -718,9 +718,12 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
        adc->dev = dev;
 
        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!iores)
+               return -EINVAL;
+
        adc->base = devm_ioremap(dev, iores->start, resource_size(iores));
-       if (IS_ERR(adc->base))
-               return PTR_ERR(adc->base);
+       if (!adc->base)
+               return -ENOMEM;
 
        init_completion(&adc->completion);
        spin_lock_init(&adc->lock);