From: Heiko Stuebner <heiko@sntech.de>
To: kishon@ti.com, mturquette@baylibre.com, sboyd@codeaurora.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
dianders@chromium.org, romain.perier@gmail.com, arnd@arndb.de,
Heiko Stuebner <heiko@sntech.de>
Subject: [PATCH 1/8] phy: rockchip-usb: fix clock get-put mismatch
Date: Wed, 4 Nov 2015 22:44:07 +0100 [thread overview]
Message-ID: <1446673454-9529-2-git-send-email-heiko@sntech.de> (raw)
In-Reply-To: <1446673454-9529-1-git-send-email-heiko@sntech.de>
Currently the phy driver only gets the optional clock reference but
never puts it again, neither during error handling nor on remove.
Fix that by moving the clk_put to a devm-action that gets called at
the right time when all other devm actions are done.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/phy/phy-rockchip-usb.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c
index 91d6f34..dfc056b 100644
--- a/drivers/phy/phy-rockchip-usb.c
+++ b/drivers/phy/phy-rockchip-usb.c
@@ -90,6 +90,14 @@ static const struct phy_ops ops = {
.owner = THIS_MODULE,
};
+static void rockchip_usb_phy_action(void *data)
+{
+ struct rockchip_usb_phy *rk_phy = data;
+
+ if (rk_phy->clk)
+ clk_put(rk_phy->clk);
+}
+
static int rockchip_usb_phy_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -124,6 +132,13 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev)
if (IS_ERR(rk_phy->clk))
rk_phy->clk = NULL;
+ err = devm_add_action(dev, rockchip_usb_phy_action, rk_phy);
+ if (err) {
+ if (rk_phy->clk)
+ clk_put(rk_phy->clk);
+ return err;
+ }
+
rk_phy->phy = devm_phy_create(dev, child, &ops);
if (IS_ERR(rk_phy->phy)) {
dev_err(dev, "failed to create PHY\n");
--
2.6.2
next prev parent reply other threads:[~2015-11-04 21:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 21:44 [PATCH 0/8] phy: rockchip-usb: correct pll handling and usb-uart Heiko Stuebner
2015-11-04 21:44 ` Heiko Stuebner [this message]
2015-11-04 23:34 ` [PATCH 1/8] phy: rockchip-usb: fix clock get-put mismatch Doug Anderson
2015-11-13 6:28 ` Kishon Vijay Abraham I
2015-11-04 21:44 ` [PATCH 2/8] phy: rockchip-usb: introduce a common data-struct for the device Heiko Stuebner
2015-11-04 23:46 ` Doug Anderson
2015-11-04 23:55 ` Heiko Stuebner
2015-11-04 21:44 ` [PATCH 3/8] phy: rockchip-usb: move per-phy init into a separate function Heiko Stuebner
2015-11-04 23:53 ` Doug Anderson
2015-11-04 21:44 ` [PATCH 4/8] phy: rockchip-usb: expose the phy-internal PLLs Heiko Stuebner
2015-11-13 8:48 ` Kishon Vijay Abraham I
2015-11-04 21:44 ` [PATCH 5/8] clk: rockchip: fix usbphy-related clocks Heiko Stuebner
2015-12-05 0:07 ` Michael Turquette
2015-12-05 10:12 ` Heiko Stübner
2015-11-04 21:44 ` [PATCH 6/8] ARM: dts: rockchip: add clock-cells for usb phy nodes Heiko Stuebner
2015-12-05 0:07 ` Michael Turquette
2015-11-04 21:44 ` [PATCH 7/8] ARM: dts: rockchip: assign usbphy480m_src to the new usbphy pll on veyron Heiko Stuebner
2015-11-04 21:44 ` [PATCH 8/8] phy: rockchip-usb: add handler for usb-uart functionality Heiko Stuebner
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=1446673454-9529-2-git-send-email-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=arnd@arndb.de \
--cc=dianders@chromium.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=romain.perier@gmail.com \
--cc=sboyd@codeaurora.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
all inboxes | Powered by JetHome®