linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lubomir Rintel <lkundrak@v3.sk>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>,
	Christian Gmeiner <christian.gmeiner@gmail.com>,
	etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org, Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH 1/3] drm/etnaviv: Fix error path on failure to enable bus clk
Date: Wed, 13 May 2020 17:00:05 +0200	[thread overview]
Message-ID: <20200513150007.1315395-2-lkundrak@v3.sk> (raw)
In-Reply-To: <20200513150007.1315395-1-lkundrak@v3.sk>

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>
---
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)
 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;
 }
-- 
2.26.2


  reply	other threads:[~2020-05-13 15:00 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <[PATCH 0/3] drm/etnaviv: Clock fixes>
2020-05-13 15:00 ` Lubomir Rintel
2020-05-13 15:00   ` Lubomir Rintel [this message]
2020-05-13 15:00   ` [PATCH 2/3] drm/etnaviv: Don't ignore errors on getting clocks Lubomir Rintel
2020-05-13 16:07     ` Fabio Estevam
2020-05-13 17:09     ` Fabio Estevam
2020-05-14  2:41       ` Fabio Estevam
2020-05-14  8:18         ` Lucas Stach
2020-05-14  8:27           ` Russell King - ARM Linux admin
2020-05-14  8:40             ` Lucas Stach
2020-05-14  8:53               ` Russell King - ARM Linux admin
2020-05-20 13:38                 ` Lubomir Rintel
2020-05-20 14:04                   ` Lucas Stach
2020-05-20 15:00                     ` Russell King - ARM Linux admin
2020-05-23 10:22                     ` Lubomir Rintel
2020-05-13 15:00   ` [PATCH 3/3] drm/etnaviv: Simplify clock enable/disable Lubomir Rintel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200513150007.1315395-2-lkundrak@v3.sk \
    --to=lkundrak@v3.sk \
    --cc=christian.gmeiner@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=etnaviv@lists.freedesktop.org \
    --cc=l.stach@pengutronix.de \
    --cc=linux+etnaviv@armlinux.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 1/3] drm/etnaviv: Fix error path on failure to enable bus clk' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).