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

869619e6 · Mark Brown · cbdd39ca · eb4a219d · 869619e6
显示空白变更内容
内联并排

Showing with 2 addition and 1 deletion

drivers/base/regmap/regmap-mmio.c drivers/base/regmap/regmap-mmio.c +2 -1

未找到文件。
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -206,6 +206,7 @@ static void regmap_mmio_free_context(void *context)

 	if (!IS_ERR(ctx->clk)) {
 		clk_unprepare(ctx->clk);
+		if (!ctx->attached_clk)
 			clk_put(ctx->clk);
 	}
 	kfree(context);