diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-07-14 12:43:04 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-17 03:35:59 -0400 |
commit | da78b7998e365b3f90b2a1a55d3b6ba6cc0c5905 (patch) | |
tree | 159aa42c14b598f43a6e3ea2b71aae5e45f64642 /drivers/net/can | |
parent | 0e84eb0b8a04b95b66aae652f947cbadffc6a25c (diff) |
can: softing: softing_main: ensure a consistent return value in error case
Typically, the return value desired for the failure of a function with an
integer return value is a negative integer. In these cases, the return
value is sometimes a negative integer and sometimes 0, due to a subsequent
initialization of the return variable within the loop.
A simplified version of the semantic match that finds this problem is:
(http://coccinelle.lip6.fr/)
//<smpl>
@r exists@
identifier ret;
position p;
constant C;
expression e1,e3,e4;
statement S;
@@
ret = -C
... when != ret = e3
when any
if@p (...) S
... when any
if (\(ret != 0\|ret < 0\|ret > 0\) || ...) { ... return ...; }
... when != ret = e3
when any
*if@p (...)
{
... when != ret = e4
return ret;
}
//</smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/softing/softing_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c index a7c77c744ee9..f2a221e7b968 100644 --- a/drivers/net/can/softing/softing_main.c +++ b/drivers/net/can/softing/softing_main.c | |||
@@ -826,12 +826,12 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev) | |||
826 | goto sysfs_failed; | 826 | goto sysfs_failed; |
827 | } | 827 | } |
828 | 828 | ||
829 | ret = -ENOMEM; | ||
830 | for (j = 0; j < ARRAY_SIZE(card->net); ++j) { | 829 | for (j = 0; j < ARRAY_SIZE(card->net); ++j) { |
831 | card->net[j] = netdev = | 830 | card->net[j] = netdev = |
832 | softing_netdev_create(card, card->id.chip[j]); | 831 | softing_netdev_create(card, card->id.chip[j]); |
833 | if (!netdev) { | 832 | if (!netdev) { |
834 | dev_alert(&pdev->dev, "failed to make can[%i]", j); | 833 | dev_alert(&pdev->dev, "failed to make can[%i]", j); |
834 | ret = -ENOMEM; | ||
835 | goto netdev_failed; | 835 | goto netdev_failed; |
836 | } | 836 | } |
837 | priv = netdev_priv(card->net[j]); | 837 | priv = netdev_priv(card->net[j]); |