1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 1a45f75dc9b2..449522f0540c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1034,12 +1034,12 @@ static int ide_disk_remove(struct device *dev)
         struct ide_disk_obj *idkp = drive->driver_data;
         struct gendisk *g = idkp->disk;
 
-        ide_cacheflush_p(drive);
-
         ide_unregister_subdriver(drive, idkp->driver);
 
         del_gendisk(g);
 
+        ide_cacheflush_p(drive);
+
         ide_disk_put(idkp);
 
         return 0;
@@ -1266,7 +1266,7 @@ static void __exit idedisk_exit (void)
         driver_unregister(&idedisk_driver.gen_driver);
 }
 
-static int idedisk_init (void)
+static int __init idedisk_init(void)
 {
         return driver_register(&idedisk_driver.gen_driver);
 }