[S390] dasd: sync after async probe

Some functions called as a late_initcall depend on completely
initialized devices. Since commit
f3445a1a656bc26b07946cc6d20de1ef07c8d116 the dasd driver uses the
new async framework and relies on the fact that synchronization is
done in prepare_namespace which is called after the late_initcalls.

Fix this by calling async_synchronize_full at the end of the related
init functions.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 14 insertions, 2 deletions

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index c4e818111a4..216c09bcd22 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/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/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 8c3c8ffbc8b..597c6ffdb9f 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/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