From 9998cade9c3e27b04d7ace8a8bc39bc93ba12ee4 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Wed, 3 Oct 2012 18:17:53 +0200
Subject: [PATCH] --- yaml --- r: 330227 b: refs/heads/master c:
 ba9b6f9f7a9eccf09440848d1c63e9f4c77eaa58 h: refs/heads/master i:   330225:
 be26242b888af1e9d753759795f3415135af6638   330223:
 8c68fe85ed1a65228eb2fd6fefab9e497ca0ea84 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/can/sja1000/peak_pcmcia.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9aac6cb66a7b..c743e4dc4ea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a4bfdcd29572864a561f64a09af9ff444f3cd41
+refs/heads/master: ba9b6f9f7a9eccf09440848d1c63e9f4c77eaa58
diff --git a/trunk/drivers/net/can/sja1000/peak_pcmcia.c b/trunk/drivers/net/can/sja1000/peak_pcmcia.c
index ec6bd9d1b2af..272a85f32b14 100644
--- a/trunk/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/trunk/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);