Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[deliverable/linux.git] / drivers / block / floppy.c

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index f9bfecd733a8fe28a2cb6bfb56871576044fef74..c557057fe8ae05fd3ce2f93dc8f0c801083cb24f 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4350,8 +4350,7 @@ static int __init do_floppy_init(void)
                /* to be cleaned up... */
                disks[drive]->private_data = (void *)(long)drive;
                disks[drive]->flags |= GENHD_FL_REMOVABLE;
-               disks[drive]->driverfs_dev = &floppy_device[drive].dev;
-               add_disk(disks[drive]);
+               device_add_disk(&floppy_device[drive].dev, disks[drive]);
        }
 
        return 0;