Browse Source

drivers/dma: fix error return code

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>
Julia Lawall 11 years ago
parent
commit
f3b77727e8
2 changed files with 4 additions and 1 deletions
  1. 3 1
      drivers/dma/cppi41.c
  2. 1 0
      drivers/dma/ppc4xx/adma.c

+ 3 - 1
drivers/dma/cppi41.c

@@ -972,8 +972,10 @@ static int cppi41_dma_probe(struct platform_device *pdev)
 		goto err_chans;
 		goto err_chans;
 
 
 	irq = irq_of_parse_and_map(dev->of_node, 0);
 	irq = irq_of_parse_and_map(dev->of_node, 0);
-	if (!irq)
+	if (!irq) {
+		ret = -EINVAL;
 		goto err_irq;
 		goto err_irq;
+	}
 
 
 	cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER);
 	cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER);
 
 

+ 1 - 0
drivers/dma/ppc4xx/adma.c

@@ -4139,6 +4139,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
 	regs = ioremap(res.start, resource_size(&res));
 	regs = ioremap(res.start, resource_size(&res));
 	if (!regs) {
 	if (!regs) {
 		dev_err(&ofdev->dev, "failed to ioremap regs!\n");
 		dev_err(&ofdev->dev, "failed to ioremap regs!\n");
+		ret = -ENOMEM;
 		goto err_regs_alloc;
 		goto err_regs_alloc;
 	}
 	}