Message ID | 1349469667-6137-4-git-send-email-peter.senna@gmail.com |
---|---|
State | Not Applicable, archived |
Headers | show |
On 10/05/2012 10:41 PM, Peter Senna Tschudin wrote: > From: Peter Senna Tschudin <peter.senna@gmail.com> > > The function pcan_probe() return 0 for success and negative value > for most of its internal tests failures. There is one exception > that is error case going to probe_err_4:. Fore this error case, the > function abort its success execution path but returns non negative > value, making it difficult for a caller function to notice the error. > > This patch fixes the error case that do not return negative value. > > 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> Too late, v1 of this patch is already in net/master regards, Marc
This patch was already in the tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);