summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-03 19:50:20 +0000
committerMark Brown <broonie@kernel.org>2017-11-03 19:53:42 +0000
commit267f3e4f18f1ccf9e8cf72c3b4689df03025516d (patch)
treebe877c167170dde39be2493be750dbfb4a08efc5 /drivers/base
parentf25637a6b89e59eddf79f6df39b23e202753f555 (diff)
downloadlinux-267f3e4f18f1ccf9e8cf72c3b4689df03025516d.tar.bz2
regmap: Also protect hwspinlock in error handling path
The previous patch to allow the hwspinlock code to be disabled missed handling the free in the error path, do so using the better IS_ENABLED() pattern as suggested by Baolin. While we're at it also check that we have a hardware spinlock before freeing it - the core code reports an error when freeing an invalid lock. Suggested-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index ff6ef6a579c6..5ff549fa880b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1116,7 +1116,8 @@ err_range:
regmap_range_exit(map);
kfree(map->work_buf);
err_hwlock:
- hwspin_lock_free(map->hwlock);
+ if (IS_ENABLED(REGMAP_HWSPINLOCK) && map->hwlock)
+ hwspin_lock_free(map->hwlock);
err_map:
kfree(map);
err: