From 46b8e2a71b3da955b1594594d02c1426538ed8ab Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Thu, 25 Apr 2013 13:03:18 +0200
Subject: [PATCH] --- yaml --- r: 362821 b: refs/heads/master c:
 fff60fabc71c41bd1bd4beb4fdd735bb8e01096c h: refs/heads/master i:   362819:
 218408c282a36ad5785495d102e842d4f0f5dd64 v: v3

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

diff --git a/[refs] b/[refs]
index ac41a067eb04..cad6ae98844e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd86055fc938493259a15dc00ee77435b4d2e83f
+refs/heads/master: fff60fabc71c41bd1bd4beb4fdd735bb8e01096c
diff --git a/trunk/drivers/s390/block/scm_blk.c b/trunk/drivers/s390/block/scm_blk.c
index e9b9c8392832..b303cab76a7f 100644
--- a/trunk/drivers/s390/block/scm_blk.c
+++ b/trunk/drivers/s390/block/scm_blk.c
@@ -465,7 +465,7 @@ static int __init scm_blk_init(void)
 	scm_major = ret;
 	ret = scm_alloc_rqs(nr_requests);
 	if (ret)
-		goto out_unreg;
+		goto out_free;
 
 	scm_debug = debug_register("scm_log", 16, 1, 16);
 	if (!scm_debug) {
@@ -486,7 +486,6 @@ static int __init scm_blk_init(void)
 	debug_unregister(scm_debug);
 out_free:
 	scm_free_rqs();
-out_unreg:
 	unregister_blkdev(scm_major, "scm");
 out:
 	return ret;