From 9db06e6ad89f14a88ab169944023b8f518978f5b Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Fri, 18 Dec 2009 17:43:15 +0100
Subject: [PATCH] --- yaml --- r: 177997 b: refs/heads/master c:
 ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2 h: refs/heads/master i:   177995:
 902138feead179bf1e8a2bd7a2e276e4015529d5 v: v3

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

diff --git a/[refs] b/[refs]
index 49109e098ca2..771aa38d5ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ee9518cfc8baec618e69e4ef22566dcb2f29d3
+refs/heads/master: ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 73901c9e260f..a6c7d5426fb2 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -1519,6 +1519,7 @@ static int ccw_device_console_enable(struct ccw_device *cdev,
 	sch->driver = &io_subchannel_driver;
 	/* Initialize the ccw_device structure. */
 	cdev->dev.parent= &sch->dev;
+	sch_set_cdev(sch, cdev);
 	io_subchannel_recog(cdev, sch);
 	/* Now wait for the async. recognition to come to an end. */
 	spin_lock_irq(cdev->ccwlock);