aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-10-03 12:17:54 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-10-04 13:24:39 -0400
commit4a4bfdcd29572864a561f64a09af9ff444f3cd41 (patch)
tree6949c50df59cea34c3517edc2b7c3fd149e46863
parentc0b8b99287235626a5850ef7e5bfc842d1ebcecd (diff)
can: peak_pci: fix error return code
Convert a nonnegative error return code 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: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/sja1000/peak_pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index f0a12962f7b6..f5b82aeb2540 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -583,12 +583,14 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev,
583 cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE); 583 cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE);
584 if (!cfg_base) { 584 if (!cfg_base) {
585 dev_err(&pdev->dev, "failed to map PCI resource #0\n"); 585 dev_err(&pdev->dev, "failed to map PCI resource #0\n");
586 err = -ENOMEM;
586 goto failure_release_regions; 587 goto failure_release_regions;
587 } 588 }
588 589
589 reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels); 590 reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels);
590 if (!reg_base) { 591 if (!reg_base) {
591 dev_err(&pdev->dev, "failed to map PCI resource #1\n"); 592 dev_err(&pdev->dev, "failed to map PCI resource #1\n");
593 err = -ENOMEM;
592 goto failure_unmap_cfg_base; 594 goto failure_unmap_cfg_base;
593 } 595 }
594 596