]> git.karo-electronics.de Git - linux-beck.git/commitdiff
iio: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 8 Jun 2014 20:12:00 +0000 (21:12 +0100)
committerJonathan Cameron <jic23@kernel.org>
Thu, 7 Aug 2014 09:26:53 +0000 (10:26 +0100)
Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/adc/xilinx-xadc-core.c

index fd2745c629436f6fa51c15a851c6b7ace8d14400..196e269e48d1a84350b078eddbf711e87481918e 100644 (file)
@@ -1201,12 +1201,16 @@ static int xadc_probe(struct platform_device *pdev)
                        goto err_device_free;
 
                xadc->convst_trigger = xadc_alloc_trigger(indio_dev, "convst");
-               if (IS_ERR(xadc->convst_trigger))
+               if (IS_ERR(xadc->convst_trigger)) {
+                       ret = PTR_ERR(xadc->convst_trigger);
                        goto err_triggered_buffer_cleanup;
+               }
                xadc->samplerate_trigger = xadc_alloc_trigger(indio_dev,
                        "samplerate");
-               if (IS_ERR(xadc->samplerate_trigger))
+               if (IS_ERR(xadc->samplerate_trigger)) {
+                       ret = PTR_ERR(xadc->samplerate_trigger);
                        goto err_free_convst_trigger;
+               }
        }
 
        xadc->clk = devm_clk_get(&pdev->dev, NULL);