Applied "regmap: cache: Move the num_reg_defaults check as early as possible" to the regmap tree
Subsystems (2)
Mark Brown
maintainerThe patch
regmap: cache: Move the num_reg_defaults check as early as possible
has been applied to the regmap tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
167f7066a637332b463adf3b87b2af1c1031591aMon Sep 17 00:00:00 2001
From: Xiubo Li <[email protected]>
Date: Fri, 11 Dec 2015 11:23:20 +0800
Subject: [PATCH] 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.
--- drivers/base/regmap/regcache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/base/regmap/regcache.c +6 -2
@@ -109,6 +109,12 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)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++)if (config->reg_defaults[i].reg % map->reg_stride)return -EINVAL ;
@@ -142,8 +148,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)* a copy of it. */ if (config->reg_defaults) { -if (!map->num_reg_defaults) -return -EINVAL ; tmp_buf =kmemdup (config->reg_defaults, map->num_reg_defaults *sizeof (struct reg_default ),GFP_KERNEL );if (!tmp_buf)
Signature · 1 line
2.6.4