diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2020-06-16 23:21:24 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2020-06-18 14:23:10 +0200 |
| commit | f8794feaf65cdc97767604cf864775d20b97f397 (patch) | |
| tree | 967614db89d7401f0d6f8e0225d51aeeaefb14e7 | |
| parent | 86824e60b0b17b68ba0e2c89e5124f9d53d0474f (diff) | |
| download | linux-f8794feaf65cdc97767604cf864775d20b97f397.tar.gz linux-f8794feaf65cdc97767604cf864775d20b97f397.tar.xz | |
drm/etnaviv: Fix error path on failure to enable bus clk
Since commit 65f037e8e908 ("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: 65f037e8e908 ("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>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index a31eeff2b297..c6dacfe3d321 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -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; } |