From c7fb3f7479111ba8c18f3fd8ad5cf959a6dac591 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Mon, 24 Sep 2012 04:24:27 +0000
Subject: [PATCH] --- yaml --- r: 328089 b: refs/heads/master c:
 b8f37a4aa053c68836deca1ddeb509ce6f5ec0ae h: refs/heads/master i:   328087:
 e2367b97ccbf4ae4932f880c902b2a8b49f8a45b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/net/ctcm_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1acad7f36722..d4bddd7c8cc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6531084c3eeaf302d6e3817776da6dab15603929
+refs/heads/master: b8f37a4aa053c68836deca1ddeb509ce6f5ec0ae
diff --git a/trunk/drivers/s390/net/ctcm_main.c b/trunk/drivers/s390/net/ctcm_main.c
index 5227e5734a9d..98ea9cc6f1aa 100644
--- a/trunk/drivers/s390/net/ctcm_main.c
+++ b/trunk/drivers/s390/net/ctcm_main.c
@@ -1454,7 +1454,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
 				ch_fsm_len, GFP_KERNEL);
 	}
 	if (ch->fsm == NULL)
-				goto free_return;
+				goto nomem_return;
 
 	fsm_newstate(ch->fsm, CTC_STATE_IDLE);