From: Eric Anholt <eric@anholt.net>
To: dri-devel@lists.freedesktop.org,
Philippe CORNU <philippe.cornu@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Yannick Fertre <yannick.fertre@st.com>
Cc: linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>
Subject: [PATCH 1/2] drm/stm: Fix leak of pixel clock enable in some error paths.
Date: Thu, 22 Jun 2017 10:56:35 -0700 [thread overview]
Message-ID: <20170622175636.22723-1-eric@anholt.net> (raw)
In-Reply-To: <1497889685-27349-2-git-send-email-philippe.cornu@st.com>
The clock gets enabled early on in init, since it's required in order
to read registers. If only devm_clk_prepare_enable() was a thing!
Signed-off-by: Eric Anholt <eric@anholt.net>
---
This fixup, if you like, I would slip in before patch 1 of your series.
drivers/gpu/drm/stm/ltdc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index 8aa05860029f..7d7e889f09c3 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -908,13 +908,15 @@ int ltdc_load(struct drm_device *ddev)
if (of_address_to_resource(np, 0, &res)) {
DRM_ERROR("Unable to get resource\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto err;
}
ldev->regs = devm_ioremap_resource(dev, &res);
if (IS_ERR(ldev->regs)) {
DRM_ERROR("Unable to get ltdc registers\n");
- return PTR_ERR(ldev->regs);
+ ret = PTR_ERR(ldev->regs);
+ goto err;
}
for (i = 0; i < MAX_IRQ; i++) {
@@ -927,7 +929,7 @@ int ltdc_load(struct drm_device *ddev)
dev_name(dev), ddev);
if (ret) {
DRM_ERROR("Failed to register LTDC interrupt\n");
- return ret;
+ goto err;
}
}
@@ -942,7 +944,7 @@ int ltdc_load(struct drm_device *ddev)
if (ret) {
DRM_ERROR("hardware identifier (0x%08x) not supported!\n",
ldev->caps.hw_version);
- return ret;
+ goto err;
}
DRM_INFO("ltdc hw version 0x%08x - ready\n", ldev->caps.hw_version);
--
2.11.0
next parent reply other threads:[~2017-06-22 17:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1497889685-27349-2-git-send-email-philippe.cornu@st.com>
2017-06-22 17:56 ` Eric Anholt [this message]
2017-06-22 17:56 ` [PATCH 2/2] drm/stm: Fixup for "drm/stm: ltdc: Add panel-bridge support" Eric Anholt
2017-06-23 14:46 ` Philippe CORNU
2017-06-23 18:18 ` Eric Anholt
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=20170622175636.22723-1-eric@anholt.net \
--to=eric@anholt.net \
--cc=alexandre.torgue@st.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=philippe.cornu@st.com \
--cc=yannick.fertre@st.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®