diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-04 13:03:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-04 13:03:03 +0200 |
| commit | 869619e627287606d4d36a72a6e2127230f95507 (patch) | |
| tree | 0af42994356fa409acb6aac761d8e5297e961fa2 /drivers/base/regmap | |
| parent | regmap: slimbus: allow register offsets up to 16 bits (diff) | |
| parent | regmap: Skip clk_put for attached clocks when freeing context (diff) | |
| download | linux-869619e627287606d4d36a72a6e2127230f95507.tar.xz linux-869619e627287606d4d36a72a6e2127230f95507.zip | |
Merge branch 'regmap-4.17' into regmap-4.18 for the merge window
Diffstat (limited to 'drivers/base/regmap')
| -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); } |