p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2015-11-04 11:19:39 +00:00
parent 6727479f07 8b7081442e 424fb281d6
commit 10dde28d86
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/regulator/da9052-regulator.c
View File

@ -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)

2
drivers/regulator/da9063-regulator.c
View File

@ -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;