From 7f45ebaa97cc1650133816537796268d96f1a2a6 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Thu, 25 Dec 2008 13:39:10 +0100
Subject: [PATCH] --- yaml --- r: 121392 b: refs/heads/master c:
 283fdd0b8ab102080dbffe4bcaae245f9ceda184 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e3e2edc81c8d..d8ef599f3d8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90ed2b692fa75272d7395c4e4c2de4423d52f506
+refs/heads/master: 283fdd0b8ab102080dbffe4bcaae245f9ceda184
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 2d31f06a913e..f831b6465c60 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -751,8 +751,8 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
 	/* Do first half of device_register. */
 	device_initialize(&cdev->dev);
 	if (!get_device(&sch->dev)) {
-		if (cdev->dev.release)
-			cdev->dev.release(&cdev->dev);
+		/* Release reference from device_initialize(). */
+		put_device(&cdev->dev);
 		return -ENODEV;
 	}
 	return 0;