Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / regulator / s5m8767.c

diff --git a/kernel/drivers/regulator/s5m8767.c b/kernel/drivers/regulator/s5m8767.c
index 58f5d3b..27343e1 100644 (file)
--- a/kernel/drivers/regulator/s5m8767.c
+++ b/kernel/drivers/regulator/s5m8767.c
@@ -202,9 +202,10 @@ static int s5m8767_get_register(struct s5m8767_info *s5m8767, int reg_id,
                }
        }
 
-       if (i < s5m8767->num_regulators)
-               *enable_ctrl =
-               s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;
+       if (i >= s5m8767->num_regulators)
+               return -EINVAL;
+
+       *enable_ctrl = s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;
 
        return 0;
 }
@@ -937,8 +938,12 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                        else
                                regulators[id].vsel_mask = 0xff;
 
-                       s5m8767_get_register(s5m8767, id, &enable_reg,
+                       ret = s5m8767_get_register(s5m8767, id, &enable_reg,
                                             &enable_val);
+                       if (ret) {
+                               dev_err(s5m8767->dev, "error reading registers\n");
+                               return ret;
+                       }
                        regulators[id].enable_reg = enable_reg;
                        regulators[id].enable_mask = S5M8767_ENCTRL_MASK;
                        regulators[id].enable_val = enable_val;