From: Marc Kleine-Budde <mkl@pengutronix.de>
To: davem@davemloft.net
Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org,
Peter Senna Tschudin <peter.senna@gmail.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 2/3] can: peak_pcmcia: fix error return code
Date: Thu, 4 Oct 2012 19:57:21 +0200 [thread overview]
Message-ID: <1349373442-11128-3-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1349373442-11128-1-git-send-email-mkl@pengutronix.de>
From: Peter Senna Tschudin <peter.senna@gmail.com>
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>
---
drivers/net/can/sja1000/peak_pcmcia.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index ec6bd9d..272a85f 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -686,8 +686,10 @@ static int __devinit pcan_probe(struct pcmcia_device *pdev)
/* detect available channels */
pcan_add_channels(card);
- if (!card->chan_count)
+ if (!card->chan_count) {
+ err = -ENOMEM;
goto probe_err_4;
+ }
/* init the timer which controls the leds */
init_timer(&card->led_timer);
--
1.7.10
next prev parent reply other threads:[~2012-10-04 17:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 17:57 pull-request: can 2012-10-04 Marc Kleine-Budde
2012-10-04 17:57 ` [PATCH 1/3] can: peak_pci: fix error return code Marc Kleine-Budde
2012-10-04 17:57 ` Marc Kleine-Budde [this message]
2012-10-04 17:57 ` [PATCH 3/3] can: mpc5xxx_can: fix section type conflict Marc Kleine-Budde
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=1349373442-11128-3-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peter.senna@gmail.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).