From 76fd4caddec9aad877cdaae6c8e9d5b238a773d6 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Sun, 23 Aug 2009 18:09:04 +0200
Subject: [PATCH] --- yaml --- r: 157007 b: refs/heads/master c:
 06739a8ad321b1e5140b318c648b0cc4bf8c6daa h: refs/heads/master i:   157005:
 e3e21729cb6537a59a15467cc21d934ba6416915   157003:
 db310a14c4ab34e7e3424c1a16dd7d16d9b5f9b4   156999:
 d80169ab5fd15a49b7d87a74ffd92b4f409b157f   156991:
 3cba487d3a3bd91990d6ed2e0e823e8db62a3592 v: v3

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

diff --git a/[refs] b/[refs]
index fc61bbcc176a..36f0ab747193 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3edf2fb9d80a46d6c32ba12547a42419845b4b76
+refs/heads/master: 06739a8ad321b1e5140b318c648b0cc4bf8c6daa
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 3c57c1a18bb8..d593bc76afe3 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -772,10 +772,8 @@ static struct ccw_device * io_subchannel_create_ccwdev(struct subchannel *sch)
 	cdev = io_subchannel_allocate_dev(sch);
 	if (!IS_ERR(cdev)) {
 		ret = io_subchannel_initialize_dev(sch, cdev);
-		if (ret) {
-			kfree(cdev);
+		if (ret)
 			cdev = ERR_PTR(ret);
-		}
 	}
 	return cdev;
 }