From: Peter Senna Tschudin <peter.senna@gmail.com>
To: wg@grandegger.com
Cc: mkl@pengutronix.de, davem@davemloft.net, jj@chaosbits.net,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Peter Senna Tschudin <peter.senna@gmail.com>
Subject: [PATCH 3/20 V2] drivers/net/can/sja1000/peak_pci.c: fix error return code
Date: Fri, 5 Oct 2012 22:41:05 +0200 [thread overview]
Message-ID: <1349469667-6137-3-git-send-email-peter.senna@gmail.com> (raw)
In-Reply-To: <1349469667-6137-1-git-send-email-peter.senna@gmail.com>
From: Peter Senna Tschudin <peter.senna@gmail.com>
The function peak_pci_probe() return 0 for success and negative value
for most of its internal tests failures. There are two exceptions
that are error cases going to failure_*:. Fore this two cases the
function abort its success execution path, but returns non negative
value, making it dificult for a caller function to notice the error.
This patch fixes the error cases that do not return negative values.
This was found by Coccinelle, but the code change was made by hand.
This patch is not robot generated.
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>
---
Change from V1:
Updated commit message. See:
http://www.kernelhub.org/?p=2&msg=139319
drivers/net/can/sja1000/peak_pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index f0a1296..f5b82ae 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,
cfg_base = pci_iomap(pdev, 0, PEAK_PCI_CFG_SIZE);
if (!cfg_base) {
dev_err(&pdev->dev, "failed to map PCI resource #0\n");
+ err = -ENOMEM;
goto failure_release_regions;
}
reg_base = pci_iomap(pdev, 1, PEAK_PCI_CHAN_SIZE * channels);
if (!reg_base) {
dev_err(&pdev->dev, "failed to map PCI resource #1\n");
+ err = -ENOMEM;
goto failure_unmap_cfg_base;
}
next prev parent reply other threads:[~2012-10-05 20:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 20:41 [PATCH 1/20 V2] drivers/net/ethernet/dec/tulip/dmfe.c: fix error return code Peter Senna Tschudin
2012-10-05 20:41 ` [PATCH 2/20 V2] drivers/net/ethernet/natsemi/natsemi.c: " Peter Senna Tschudin
2012-10-05 21:40 ` Francois Romieu
2012-10-07 18:38 ` David Miller
2012-10-05 20:41 ` Peter Senna Tschudin [this message]
2012-10-05 21:06 ` [PATCH 3/20 V2] drivers/net/can/sja1000/peak_pci.c: " Marc Kleine-Budde
2012-10-07 18:38 ` David Miller
2012-10-05 20:41 ` [PATCH 4/20 V2] drivers/net/can/sja1000/peak_pcmcia.c: " Peter Senna Tschudin
2012-10-05 21:07 ` Marc Kleine-Budde
2012-10-07 18:38 ` David Miller
2012-10-05 20:41 ` [PATCH 5/20 V2] drivers/net/ethernet/sis/sis900.c: " Peter Senna Tschudin
2012-10-07 18:38 ` David Miller
2012-10-07 18:37 ` [PATCH 1/20 V2] drivers/net/ethernet/dec/tulip/dmfe.c: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349469667-6137-3-git-send-email-peter.senna@gmail.com \
--to=peter.senna@gmail.com \
--cc=davem@davemloft.net \
--cc=jj@chaosbits.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).