drivers/dma: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 29 Dec 2013 22:47:23 +0000 (23:47 +0100)
committerVinod Koul <vinod.koul@intel.com>
Mon, 20 Jan 2014 09:28:03 +0000 (14:58 +0530)
Set the return variable to an error code as done 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: Vinod Koul <vinod.koul@intel.com>
drivers/dma/cppi41.c
drivers/dma/ppc4xx/adma.c

index c29dacf..c18aebf 100644 (file)
@@ -972,8 +972,10 @@ static int cppi41_dma_probe(struct platform_device *pdev)
                goto err_chans;
 
        irq = irq_of_parse_and_map(dev->of_node, 0);
-       if (!irq)
+       if (!irq) {
+               ret = -EINVAL;
                goto err_irq;
+       }
 
        cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER);
 
index 8da48c6..f9e5c0a 100644 (file)
@@ -4139,6 +4139,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
        regs = ioremap(res.start, resource_size(&res));
        if (!regs) {
                dev_err(&ofdev->dev, "failed to ioremap regs!\n");
+               ret = -ENOMEM;
                goto err_regs_alloc;
        }