Merge branch 'regmap-4.17' into regmap-4.18 for the merge window

This commit is contained in:
Mark Brown 2018-06-04 12:03:03 +01:00
commit 869619e627
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0

View File

@ -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);
}