From 13f45239ca49aa2ed373f54b95a6d5c42d427402 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 14 Nov 2008 18:18:06 +0100
Subject: [PATCH] --- yaml --- r: 119015 b: refs/heads/master c:
 85acc407bf1c49fb40b8f461c2c7526af736d87e h: refs/heads/master i:   119013:
 a597870b615c0f175863cfeceef1045503b522c2   119011:
 6d4c72ac719f90ae3bb842030b1b646881c1c541   119007:
 831adf1190dcf2ec275523e8126a2d909c7b612b v: v3

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

diff --git a/[refs] b/[refs]
index f18d4dcb4f20..73e9001096f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50bec4ce5d36ebf96189dcc54e20c7fce4bf61bf
+refs/heads/master: 85acc407bf1c49fb40b8f461c2c7526af736d87e
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 4e78c82194b4..4e4008325e28 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -874,11 +874,15 @@ void ccw_device_move_to_orphanage(struct work_struct *work)
 	replacing_cdev = get_disc_ccwdev_by_dev_id(&dev_id, cdev);
 	if (replacing_cdev) {
 		sch_attach_disconnected_device(sch, replacing_cdev);
+		/* Release reference from get_disc_ccwdev_by_dev_id() */
+		put_device(&cdev->dev);
 		return;
 	}
 	replacing_cdev = get_orphaned_ccwdev_by_dev_id(css, &dev_id);
 	if (replacing_cdev) {
 		sch_attach_orphaned_device(sch, replacing_cdev);
+		/* Release reference from get_orphaned_ccwdev_by_dev_id() */
+		put_device(&cdev->dev);
 		return;
 	}
 	sch_create_and_recog_new_device(sch);