Commit f8794fea authored Jun 16, 2020 by Lubomir Rintel Committed by Lucas Stach Jun 18, 2020

drm/etnaviv: Fix error path on failure to enable bus clk



Since commit 65f037e8 ("drm/etnaviv: add support for slave interface
clock") the reg clock is enabled before the bus clock and we need to undo
its enablement on error.

Fixes: 65f037e8 ("drm/etnaviv: add support for slave interface clock")
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

parent 86824e60

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1496,7 +1496,7 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)
		if (gpu->clk_bus) {
		ret = clk_prepare_enable(gpu->clk_bus);
		if (ret)
		return ret;
		goto disable_clk_reg;
		}

		if (gpu->clk_core) {
		@@ -1519,6 +1519,9 @@ disable_clk_core:
		disable_clk_bus:
		if (gpu->clk_bus)
		clk_disable_unprepare(gpu->clk_bus);
		disable_clk_reg:
		if (gpu->clk_reg)
		clk_disable_unprepare(gpu->clk_reg);

		return ret;
		}

Admin message