Merge remote-tracking branches 'regulator/topic/da9053' and 'regulator/topic/da9063...

diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index e628d4c2f2ae43de1955aac857f745ec2d3d0357..12a25b40e4730319605193407cca3a6f6b8298b9 100644 (file)
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -381,6 +381,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,
        case DA9053_AA:
        case DA9053_BA:
        case DA9053_BB:
+       case DA9053_BC:
                for (i = 0; i < ARRAY_SIZE(da9053_regulator_info); i++) {
                        info = &da9053_regulator_info[i];
                        if (info->reg_desc.id == id)

diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index aed1ad3dc964e231c76dc4131a42316f2b13a5fe..536e931eb9217feebd6b4e33d479f8a579c4c101 100644 (file)
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -698,7 +698,7 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt(
                rdata->initdata = da9063_matches[i].init_data;
 
                n++;
-       };
+       }
 
        *da9063_reg_matches = da9063_matches;
        return pdata;