]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
solos-pci: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 7 Aug 2014 12:49:07 +0000 (14:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Aug 2014 23:02:57 +0000 (16:02 -0700)
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>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/atm/solos-pci.c

index 943cf0d6abaf8b959e2a879ca901fedaea693b1e..7652e8dc188f93036e03a23a99ac7aee3b543811 100644 (file)
@@ -1278,6 +1278,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                        card->dma_bounce = kmalloc(card->nr_ports * BUF_SIZE, GFP_KERNEL);
                        if (!card->dma_bounce) {
                                dev_warn(&card->dev->dev, "Failed to allocate DMA bounce buffers\n");
+                               err = -ENOMEM;
                                /* Fallback to MMIO doesn't work */
                                goto out_unmap_both;
                        }