[PATCH v9 2/8] power: regulator: palmas: fix ldoln and ldousb detection

[Svyatoslav Ryhel]

dev->driver_data will carry the tail of ldo if there is a number and
if there is no number it will be an error code, anyway it will not be
zero. This results in a wrong ldo regulator detection.

To avoid this check for non-numerical ldo first and then manipulate
dev->driver_data.

Signed-off-by: Svyatoslav Ryhel <clamo...@gmail.com>
---
 drivers/power/regulator/palmas_regulator.c | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/power/regulator/palmas_regulator.c 
b/drivers/power/regulator/palmas_regulator.c
index 3c4eb83be7..d615e94734 100644
--- a/drivers/power/regulator/palmas_regulator.c
+++ b/drivers/power/regulator/palmas_regulator.c
@@ -301,19 +301,23 @@ static int palmas_ldo_probe(struct udevice *dev)
 
        uc_pdata->type = REGULATOR_TYPE_LDO;
 
-       if (dev->driver_data) {
+       /* check for ldoln and ldousb cases */
+       if (!strcmp("ldoln", dev->name)) {
+               uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][9];
+               uc_pdata->volt_reg = palmas_ldo_volt[type][9];
+               return 0;
+       }
+
+       if (!strcmp("ldousb", dev->name)) {
+               uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][10];
+               uc_pdata->volt_reg = palmas_ldo_volt[type][10];
+               return 0;
+       }
+
+       if (dev->driver_data > 0) {
                u8 idx = dev->driver_data - 1;
                uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][idx];
                uc_pdata->volt_reg = palmas_ldo_volt[type][idx];
-       } else {
-               /* check for ldoln and ldousb cases */
-               if (!strcmp("ldoln", dev->name)) {
-                       uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][9];
-                       uc_pdata->volt_reg = palmas_ldo_volt[type][9];
-               } else if (!strcmp("ldousb", dev->name)) {
-                       uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][10];
-                       uc_pdata->volt_reg = palmas_ldo_volt[type][10];
-               }
        }
 
        return 0;
-- 
2.39.2