---

yaml --- r: 157007 b: refs/heads/master c: 06739a8 h: refs/heads/master i: 157005: e3e2172 157003: db310a1 156999: d80169a 156991: 3cba487 v: v3
git-mirror · Aug 23, 2009 · 76fd4ca · 76fd4ca
1 parent a36a23e
commit 76fd4ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 }