xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: rockchip-usb: fix clock get-put mismatch

Browse Source 
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>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Heiko Stuebner
2015-11-19 22:22:22 +01:00
committed by Kishon Vijay Abraham I
parent 30e9a0b214
commit 75d390fecf
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/phy/phy-rockchip-usb.c
View File

@@ -90,6 +90,14 @@ static const struct phy_ops ops = {
.owner = THIS_MODULE, .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) static int rockchip_usb_phy_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@@ -123,6 +131,10 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev)
rk_phy->reg_offset = reg_offset; rk_phy->reg_offset = reg_offset;
rk_phy->reg_base = grf; rk_phy->reg_base = grf;
err = devm_add_action(dev, rockchip_usb_phy_action, rk_phy);
if (err)
return err;
rk_phy->clk = of_clk_get_by_name(child, "phyclk"); rk_phy->clk = of_clk_get_by_name(child, "phyclk");
if (IS_ERR(rk_phy->clk)) if (IS_ERR(rk_phy->clk))
rk_phy->clk = NULL; rk_phy->clk = NULL;