| commit | 869619e627287606d4d36a72a6e2127230f95507 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Mon Jun 04 12:03:03 2018 +0100 |
| committer | Mark Brown <broonie@kernel.org> | Mon Jun 04 12:03:03 2018 +0100 |
| tree | 0af42994356fa409acb6aac761d8e5297e961fa2 | |
| parent | cbdd39ca498f6b2b221614d9c1d105f2948f1dbb [diff] | |
| parent | eb4a219d19fde99616f120f5655a7121c918cd49 [diff] |
Merge branch 'regmap-4.17' into regmap-4.18 for the merge window
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index 5cadfd3..8741fb5 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); }