Browse Source

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

Mark Brown 7 years ago
parent
commit
869619e627
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/base/regmap/regmap-mmio.c

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

@@ -206,7 +206,8 @@ static void regmap_mmio_free_context(void *context)
 
 
 	if (!IS_ERR(ctx->clk)) {
 	if (!IS_ERR(ctx->clk)) {
 		clk_unprepare(ctx->clk);
 		clk_unprepare(ctx->clk);
-		clk_put(ctx->clk);
+		if (!ctx->attached_clk)
+			clk_put(ctx->clk);
 	}
 	}
 	kfree(context);
 	kfree(context);
 }
 }