diff --git a/drivers/staging/android/ion/heaps/msm_ion.c b/drivers/staging/android/ion/heaps/msm_ion.c
index fd7cb9997bc0..ab84b2f2a5c6 100644
--- a/drivers/staging/android/ion/heaps/msm_ion.c
+++ b/drivers/staging/android/ion/heaps/msm_ion.c
@@ -577,6 +577,17 @@ static struct platform_driver msm_ion_driver = {
 		.of_match_table = msm_ion_match_table,
 	},
 };
-module_platform_driver(msm_ion_driver);
+
+static int __init msm_ion_init(void)
+{
+	return platform_driver_register(&msm_ion_driver);
+}
+subsys_initcall_sync(msm_ion_init);
+
+static void __exit msm_ion_exit(void)
+{
+	return platform_driver_unregister(&msm_ion_driver);
+}
+module_exit(msm_ion_exit);
 
 MODULE_LICENSE("GPL v2");