diff options
| author | James Kelly <jamespeterkelly@gmail.com> | 2018-05-15 10:59:58 +1000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-17 16:11:41 +0900 |
| commit | eb4a219d19fde99616f120f5655a7121c918cd49 (patch) | |
| tree | 09ab0bfd69f7357b1f556006a94f188f86d56c19 | |
| parent | e241e3f2bf975788a1b70dff2eb5180ca395b28e (diff) | |
| download | linux-eb4a219d19fde99616f120f5655a7121c918cd49.tar.gz | |
regmap: Skip clk_put for attached clocks when freeing context
Capability to attach an existing clk to a MMIO regmap was introduced in 4.17rc1. However, when using attached clk, regmap does not do the clk_get. Therefore it should not do the clk_put when freeing the MMIO regmap context. There does not appear to be any users of attached clocks yet so this would be a good time to make this change before anything depends on the existing behaviour. Signed-off-by: James Kelly <jamespeterkelly@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/base/regmap/regmap-mmio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index 5cadfd3394d8..8741fb5f8f54 100644 --- a/drivers/base/regmap/regmap-mmio.c +++ b/drivers/base/regmap/regmap-mmio.c @@ -206,7 +206,8 @@ static void regmap_mmio_free_context(void *context) if (!IS_ERR(ctx->clk)) { clk_unprepare(ctx->clk); - clk_put(ctx->clk); + if (!ctx->attached_clk) + clk_put(ctx->clk); } kfree(context); } |