未验证 提交 267f3e4f 编写于 作者: M Mark Brown

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: NBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 f25637a6
......@@ -1116,7 +1116,8 @@ struct regmap *__regmap_init(struct device *dev,
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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册