1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 553f43a90953..a7d6347aaa79 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -191,6 +191,7 @@ static int print_unex = 1;
 #include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/async.h>
 
 /*
  * PS/2 floppies have much slower step rates than regular floppies.
@@ -2516,8 +2517,7 @@ static int make_raw_rw_request(void)
         set_fdc((long)current_req->rq_disk->private_data);
 
         raw_cmd = &default_raw_cmd;
-        raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_DISK |
-            FD_RAW_NEED_SEEK;
+        raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_SEEK;
         raw_cmd->cmd_count = NR_RW;
         if (rq_data_dir(current_req) == READ) {
                 raw_cmd->flags |= FD_RAW_READ;
@@ -4123,7 +4123,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
         return get_disk(disks[drive]);
 }
 
-static int __init floppy_init(void)
+static int __init do_floppy_init(void)
 {
         int i, unit, drive;
         int err, dr;
@@ -4338,6 +4338,24 @@ out_put_disk:
         return err;
 }
 
+#ifndef MODULE
+static __init void floppy_async_init(void *data, async_cookie_t cookie)
+{
+        do_floppy_init();
+}
+#endif
+
+static int __init floppy_init(void)
+{
+#ifdef MODULE
+        return do_floppy_init();
+#else
+        /* Don't hold up the bootup by the floppy initialization */
+        async_schedule(floppy_async_init, NULL);
+        return 0;
+#endif
+}
+
 static const struct io_region {
         int offset;
         int size;