aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-10-03 12:17:53 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-10-04 13:26:22 -0400
commitba9b6f9f7a9eccf09440848d1c63e9f4c77eaa58 (patch)
treef4bbce5f812f37936756364bb1d96b52256f27f6
parent4a4bfdcd29572864a561f64a09af9ff444f3cd41 (diff)
can: peak_pcmcia: 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_pcmcia.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index ec6bd9d1b2af..272a85f32b14 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)
686 686
687 /* detect available channels */ 687 /* detect available channels */
688 pcan_add_channels(card); 688 pcan_add_channels(card);
689 if (!card->chan_count) 689 if (!card->chan_count) {
690 err = -ENOMEM;
690 goto probe_err_4; 691 goto probe_err_4;
692 }
691 693
692 /* init the timer which controls the leds */ 694 /* init the timer which controls the leds */
693 init_timer(&card->led_timer); 695 init_timer(&card->led_timer);