summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-11-22 15:39:17 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-23 14:29:44 -0500
commit73112f9b08ddb32c5cdaccda61bd88dfe9baf8b2 (patch)
treeb1cb5a0b72c812f0096c4164d41ddf290bd3555c
parent17a402a0075c7848d940eb846f8db1da6a832c5d (diff)
downloadlinux-stable-73112f9b08ddb32c5cdaccda61bd88dfe9baf8b2.tar.gz
linux-stable-73112f9b08ddb32c5cdaccda61bd88dfe9baf8b2.tar.bz2
linux-stable-73112f9b08ddb32c5cdaccda61bd88dfe9baf8b2.zip
solos-pci: fix error return code
Return a negative error code on failure. 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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/solos-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 7652e8dc188f..21b0bc6a9c96 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1225,11 +1225,13 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
card->config_regs = pci_iomap(dev, 0, CONFIG_RAM_SIZE);
if (!card->config_regs) {
dev_warn(&dev->dev, "Failed to ioremap config registers\n");
+ err = -ENOMEM;
goto out_release_regions;
}
card->buffers = pci_iomap(dev, 1, DATA_RAM_SIZE);
if (!card->buffers) {
dev_warn(&dev->dev, "Failed to ioremap data buffers\n");
+ err = -ENOMEM;
goto out_unmap_config;
}