From f74662f4284fb15b4ff62f68c64a20d281107683 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Fri, 12 Jun 2009 10:26:38 +0200
Subject: [PATCH] --- yaml --- r: 148771 b: refs/heads/master c:
 736e6ea0bf97ec79521f88704ce8506e5d60d078 h: refs/heads/master i:   148769:
 b2c86ed3ba002a68cf7cd24d97cabba8c30af5d3   148767:
 7fafd312aa0aa7ba1f1644e574d3a21dd4622b7b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/s390/block/dasd_eckd.c | 8 +++++++-
 trunk/drivers/s390/block/dasd_fba.c  | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9a0936d620e5..29b742536730 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92636b152f3b58e459988934f689619af9e04dbc
+refs/heads/master: 736e6ea0bf97ec79521f88704ce8506e5d60d078
diff --git a/trunk/drivers/s390/block/dasd_eckd.c b/trunk/drivers/s390/block/dasd_eckd.c
index c4e818111a40..216c09bcd222 100644
--- a/trunk/drivers/s390/block/dasd_eckd.c
+++ b/trunk/drivers/s390/block/dasd_eckd.c
@@ -3277,8 +3277,14 @@ static struct dasd_discipline dasd_eckd_discipline = {
 static int __init
 dasd_eckd_init(void)
 {
+	int ret;
+
 	ASCEBC(dasd_eckd_discipline.ebcname, 4);
-	return ccw_driver_register(&dasd_eckd_driver);
+	ret = ccw_driver_register(&dasd_eckd_driver);
+	if (!ret)
+		wait_for_device_probe();
+
+	return ret;
 }
 
 static void __exit
diff --git a/trunk/drivers/s390/block/dasd_fba.c b/trunk/drivers/s390/block/dasd_fba.c
index 8c3c8ffbc8bf..597c6ffdb9f2 100644
--- a/trunk/drivers/s390/block/dasd_fba.c
+++ b/trunk/drivers/s390/block/dasd_fba.c
@@ -604,8 +604,14 @@ static struct dasd_discipline dasd_fba_discipline = {
 static int __init
 dasd_fba_init(void)
 {
+	int ret;
+
 	ASCEBC(dasd_fba_discipline.ebcname, 4);
-	return ccw_driver_register(&dasd_fba_driver);
+	ret = ccw_driver_register(&dasd_fba_driver);
+	if (!ret)
+		wait_for_device_probe();
+
+	return ret;
 }
 
 static void __exit