1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index c7784c4bff4f..f7d1f538c200 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -939,8 +939,9 @@ ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
 static int ab8500_regulator_probe(struct platform_device *pdev)
 {
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
-        struct ab8500_platform_data *pdata;
         struct device_node *np = pdev->dev.of_node;
+        struct ab8500_platform_data *ppdata;
+        struct ab8500_regulator_platform_data *pdata;
         int i, err;
 
         if (np) {
@@ -961,7 +962,14 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "null mfd parent\n");
                 return -EINVAL;
         }
-        pdata = dev_get_platdata(ab8500->dev);
+
+        ppdata = dev_get_platdata(ab8500->dev);
+        if (!ppdata) {
+                dev_err(&pdev->dev, "null parent pdata\n");
+                return -EINVAL;
+        }
+
+        pdata = ppdata->regulator;
         if (!pdata) {
                 dev_err(&pdev->dev, "null pdata\n");
                 return -EINVAL;
@@ -974,12 +982,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
         }
 
         /* initialize registers */
-        for (i = 0; i < pdata->num_regulator_reg_init; i++) {
+        for (i = 0; i < pdata->num_reg_init; i++) {
                 int id, mask, value;
 
-                id = pdata->regulator_reg_init[i].id;
-                mask = pdata->regulator_reg_init[i].mask;
-                value = pdata->regulator_reg_init[i].value;
+                id = pdata->reg_init[i].id;
+                mask = pdata->reg_init[i].mask;
+                value = pdata->reg_init[i].value;
 
                 /* check for configuration errors */
                 BUG_ON(id >= AB8500_NUM_REGULATOR_REGISTERS);
@@ -1045,5 +1053,6 @@ module_exit(ab8500_regulator_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Sundar Iyer <sundar.iyer@stericsson.com>");
+MODULE_AUTHOR("Bengt Jonsson <bengt.g.jonsson@stericsson.com>");
 MODULE_DESCRIPTION("Regulator Driver for ST-Ericsson AB8500 Mixed-Sig PMIC");
 MODULE_ALIAS("platform:ab8500-regulator");