lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 090/123] soc: qcom: gsbi: Fix error handling in gsbi_probe()
    Date
    From: Alexey Khoroshilov <khoroshilov@ispras.ru>

    [ Upstream commit 8cd09a3dd3e176c62da67efcd477a44a8d87185e ]

    If of_platform_populate() fails in gsbi_probe(),
    gsbi->hclk is left undisabled.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Andy Gross <andy.gross@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/qcom/qcom_gsbi.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c
    index 09c669e70d63..038abc377fdb 100644
    --- a/drivers/soc/qcom/qcom_gsbi.c
    +++ b/drivers/soc/qcom/qcom_gsbi.c
    @@ -138,7 +138,7 @@ static int gsbi_probe(struct platform_device *pdev)
    struct resource *res;
    void __iomem *base;
    struct gsbi_info *gsbi;
    - int i;
    + int i, ret;
    u32 mask, gsbi_num;
    const struct crci_config *config = NULL;

    @@ -221,7 +221,10 @@ static int gsbi_probe(struct platform_device *pdev)

    platform_set_drvdata(pdev, gsbi);

    - return of_platform_populate(node, NULL, NULL, &pdev->dev);
    + ret = of_platform_populate(node, NULL, NULL, &pdev->dev);
    + if (ret)
    + clk_disable_unprepare(gsbi->hclk);
    + return ret;
    }

    static int gsbi_remove(struct platform_device *pdev)
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 19:48    [W:4.285 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site