From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965811AbbKDVoq (ORCPT ); Wed, 4 Nov 2015 16:44:46 -0500 Received: from gloria.sntech.de ([95.129.55.99]:36583 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965463AbbKDVom (ORCPT ); Wed, 4 Nov 2015 16:44:42 -0500 From: Heiko Stuebner 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 Subject: [PATCH 1/8] phy: rockchip-usb: fix clock get-put mismatch Date: Wed, 4 Nov 2015 22:44:07 +0100 Message-Id: <1446673454-9529-2-git-send-email-heiko@sntech.de> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1446673454-9529-1-git-send-email-heiko@sntech.de> References: <1446673454-9529-1-git-send-email-heiko@sntech.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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