From: Brian Norris <briannorris@chromium.org>
To: "Heiko Stübner" <heiko@sntech.de>
Cc: Thomas Hebb <tommyhebb@gmail.com>,
dri-devel@lists.freedesktop.org,
Chen-Yu Tsai <wenst@chromium.org>,
linux-rockchip@lists.infradead.org,
Sandy Huang <hjc@rock-chips.com>,
linux-kernel@vger.kernel.org,
Brian Norris <briannorris@chromium.org>
Subject: [PATCH v2 2/3] drm/rockchip: dsi: Fix unbalanced clock on probe error
Date: Mon, 27 Sep 2021 10:59:43 -0700 [thread overview]
Message-ID: <20210927105928.v2.2.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid> (raw)
In-Reply-To: <20210927175944.3381314-1-briannorris@chromium.org>
Our probe() function never enabled this clock, so we shouldn't disable
it if we fail to probe the bridge.
Noted by inspection.
Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
---
(no changes since v1)
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index 45676b23c019..fa4080176719 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -1398,14 +1398,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev,
"Failed to probe dw_mipi_dsi: %d\n", ret);
- goto err_clkdisable;
+ return ret;
}
return 0;
-
-err_clkdisable:
- clk_disable_unprepare(dsi->pllref_clk);
- return ret;
}
static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
--
2.33.0.685.g46640cef36-goog
next prev parent reply other threads:[~2021-09-27 18:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 17:59 [PATCH v2 0/3] Fix Rockchip MIPI DSI display init timeouts Brian Norris
2021-09-27 17:59 ` [PATCH v2 1/3] drm/rockchip: dsi: Hold pm-runtime across bind/unbind Brian Norris
2021-09-27 19:17 ` Tom Hebb
2021-09-27 19:57 ` Brian Norris
2021-09-27 22:53 ` Brian Norris
2021-09-27 17:59 ` Brian Norris [this message]
2021-09-27 17:59 ` [PATCH v2 3/3] drm/rockchip: dsi: Disable PLL clock on bind error Brian Norris
2021-09-28 4:16 ` Chen-Yu Tsai
2021-09-28 21:11 ` Brian Norris
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=20210927105928.v2.2.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid \
--to=briannorris@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=tommyhebb@gmail.com \
--cc=wenst@chromium.org \
/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;
as well as URLs for NNTP newsgroup(s).