summaryrefslogtreecommitdiff
path: root/drivers/regulator/omap-pmic-regulator.c
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-05-21 12:00:33 -0700
committermattis fjallstrom <mattis@acm.org>2015-05-21 13:24:30 -0700
commit7d990a059acf5eb46ae99c058fc9911cbdce131d (patch)
treeac9531b3ff2b2670dabc84c248a1770c84109586 /drivers/regulator/omap-pmic-regulator.c
parente8980e2a6a7392ae5a1f882d1ba01e03ac83f899 (diff)
parent89fdc2c4bb83fff36199cd883a27efb317f02037 (diff)
downloadolio-linux-3.10-7d990a059acf5eb46ae99c058fc9911cbdce131d.tar.xz
olio-linux-3.10-7d990a059acf5eb46ae99c058fc9911cbdce131d.zip
Merge branch 'android-omap-minnow-3.10-lollipop-wear-release' of https://android.googlesource.com/kernel/omap into mattis_devmattis_dev
Change-Id: I46165dd7747b9b6289eb44cb96cbef2de46c10ba
Diffstat (limited to 'drivers/regulator/omap-pmic-regulator.c')
-rw-r--r--drivers/regulator/omap-pmic-regulator.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/regulator/omap-pmic-regulator.c b/drivers/regulator/omap-pmic-regulator.c
index a19f9ebb7de..2eab7c158e2 100644
--- a/drivers/regulator/omap-pmic-regulator.c
+++ b/drivers/regulator/omap-pmic-regulator.c
@@ -661,7 +661,22 @@ static struct platform_driver omap_pmic_driver = {
},
.probe = omap_pmic_probe,
};
-module_platform_driver(omap_pmic_driver);
+
+static int __init omap_pmic_init(void)
+{
+ int ret;
+ ret = platform_driver_register(&omap_pmic_driver);
+ if (ret)
+ pr_err("driver register failed for omap_pmic (%d)\n", ret);
+ return ret;
+}
+device_initcall_sync(omap_pmic_init);
+
+static void __exit omap_pmic_exit(void)
+{
+ platform_driver_unregister(&omap_pmic_driver);
+}
+module_exit(omap_pmic_exit);
MODULE_DESCRIPTION("OMAP Generic PMIC Regulator");
MODULE_LICENSE("GPL v2");