From f3afac3aed4ae2244bcdd03e676b8be642e3570a Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 25 Aug 2008 18:13:27 +0200
Subject: [PATCH] --- yaml --- r: 109173 b: refs/heads/master c:
 dbe13d9981e55c60a030d0509acc9a8968b9c5bf h: refs/heads/master i:   109171:
 67aa788724474e5be15c0d256dac4df56d43e0f0 v: v3

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

diff --git a/[refs] b/[refs]
index 047bec9e1807..34cece18ef9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5453c1a575df6232f84fad1502b2d559909265cc
+refs/heads/master: dbe13d9981e55c60a030d0509acc9a8968b9c5bf
diff --git a/trunk/drivers/s390/block/dcssblk.c b/trunk/drivers/s390/block/dcssblk.c
index db85f1fb131e..711b3004b3e6 100644
--- a/trunk/drivers/s390/block/dcssblk.c
+++ b/trunk/drivers/s390/block/dcssblk.c
@@ -384,9 +384,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
 	 * get minor, add to list
 	 */
 	down_write(&dcssblk_devices_sem);
-	if (dcssblk_get_segment_by_name(local_buf)) {
+	if (dcssblk_get_device_by_name(local_buf)) {
+		up_write(&dcssblk_devices_sem);
 		rc = -EEXIST;
-		goto release_gd;
+		goto unload_seg;
 	}
 	rc = dcssblk_assign_free_minor(dev_info);
 	if (rc) {