lkml.org 
[lkml]   [2017]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] net: phy: xgene: disable clk on error paths
On Sat, Dec 16, 2017 at 4:52 AM, Alexey Khoroshilov
<khoroshilov@ispras.ru> wrote:
>
> There are several error paths in xgene_mdio_probe(),
> where clk is left undisabled. The patch fixes them.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
> ---
> drivers/net/phy/mdio-xgene.c | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c
> index bfd3090fb055..07c6048200c6 100644
> --- a/drivers/net/phy/mdio-xgene.c
> +++ b/drivers/net/phy/mdio-xgene.c
> @@ -194,8 +194,11 @@ static int xgene_mdio_reset(struct xgene_mdio_pdata *pdata)
> }
>
> ret = xgene_enet_ecc_init(pdata);
> - if (ret)
> + if (ret) {
> + if (pdata->dev->of_node)
> + clk_disable_unprepare(pdata->clk);
> return ret;
> + }
> xgene_gmac_reset(pdata);
>
> return 0;
> @@ -388,8 +391,10 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> return ret;
>
> mdio_bus = mdiobus_alloc();
> - if (!mdio_bus)
> - return -ENOMEM;
> + if (!mdio_bus) {
> + ret = -ENOMEM;
> + goto out_clk;
> + }
>
> mdio_bus->name = "APM X-Gene MDIO bus";
>
> @@ -418,7 +423,7 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> mdio_bus->phy_mask = ~0;
> ret = mdiobus_register(mdio_bus);
> if (ret)
> - goto out;
> + goto out_mdiobus;
>
> acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(dev), 1,
> acpi_register_phy, NULL, mdio_bus, NULL);
> @@ -426,16 +431,20 @@ static int xgene_mdio_probe(struct platform_device *pdev)
> }
>
> if (ret)
> - goto out;
> + goto out_mdiobus;
>
> pdata->mdio_bus = mdio_bus;
> xgene_mdio_status = true;
>
> return 0;
>
> -out:
> +out_mdiobus:
> mdiobus_free(mdio_bus);
>
> +out_clk:
> + if (dev->of_node)
> + clk_disable_unprepare(pdata->clk);
> +
> return ret;
> }
>

Acked.

\
 
 \ /
  Last update: 2017-12-18 04:13    [W:0.037 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site