提交 167f7066 编写于 作者: X Xiubo Li 提交者: Mark Brown

regmap: cache: Move the num_reg_defaults check as early as possible

If the register defaults are provided by the driver without the
number by mistake, it should just return an error with one promotion.

This should be as early as possible, then there is no need to verify
the register defaults' stride and the other code followed.
Signed-off-by: NXiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 8cfe2fd3
...@@ -109,6 +109,12 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) ...@@ -109,6 +109,12 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
return 0; return 0;
} }
if (config->reg_defaults && !config->num_reg_defaults) {
dev_err(map->dev,
"Register defaults are set without the number!\n");
return -EINVAL;
}
for (i = 0; i < config->num_reg_defaults; i++) for (i = 0; i < config->num_reg_defaults; i++)
if (config->reg_defaults[i].reg % map->reg_stride) if (config->reg_defaults[i].reg % map->reg_stride)
return -EINVAL; return -EINVAL;
...@@ -142,8 +148,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) ...@@ -142,8 +148,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
* a copy of it. * a copy of it.
*/ */
if (config->reg_defaults) { if (config->reg_defaults) {
if (!map->num_reg_defaults)
return -EINVAL;
tmp_buf = kmemdup(config->reg_defaults, map->num_reg_defaults * tmp_buf = kmemdup(config->reg_defaults, map->num_reg_defaults *
sizeof(struct reg_default), GFP_KERNEL); sizeof(struct reg_default), GFP_KERNEL);
if (!tmp_buf) if (!tmp_buf)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册