Merge tag 'socfpga_update_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / regulator / max8907-regulator.c

diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c
index 76152aa..96dc0ee 100644 (file)
--- a/drivers/regulator/max8907-regulator.c
+++ b/drivers/regulator/max8907-regulator.c
@@ -296,7 +296,10 @@ static int max8907_regulator_probe(struct platform_device *pdev)
        memcpy(pmic->desc, max8907_regulators, sizeof(pmic->desc));
 
        /* Backwards compatibility with MAX8907B; SD1 uses different voltages */
-       regmap_read(max8907->regmap_gen, MAX8907_REG_II2RR, &val);
+       ret = regmap_read(max8907->regmap_gen, MAX8907_REG_II2RR, &val);
+       if (ret)
+               return ret;
+
        if ((val & MAX8907_II2RR_VERSION_MASK) ==
            MAX8907_II2RR_VERSION_REV_B) {
                pmic->desc[MAX8907_SD1].min_uV = 637500;
@@ -333,14 +336,20 @@ static int max8907_regulator_probe(struct platform_device *pdev)
                }
 
                if (pmic->desc[i].ops == &max8907_ldo_ops) {
-                       regmap_read(config.regmap, pmic->desc[i].enable_reg,
+                       ret = regmap_read(config.regmap, pmic->desc[i].enable_reg,
                                    &val);
+                       if (ret)
+                               return ret;
+
                        if ((val & MAX8907_MASK_LDO_SEQ) !=
                            MAX8907_MASK_LDO_SEQ)
                                pmic->desc[i].ops = &max8907_ldo_hwctl_ops;
                } else if (pmic->desc[i].ops == &max8907_out5v_ops) {
-                       regmap_read(config.regmap, pmic->desc[i].enable_reg,
+                       ret = regmap_read(config.regmap, pmic->desc[i].enable_reg,
                                    &val);
+                       if (ret)
+                               return ret;
+
                        if ((val & (MAX8907_MASK_OUT5V_VINEN |
                                                MAX8907_MASK_OUT5V_ENSRC)) !=
                            MAX8907_MASK_OUT5V_ENSRC)