lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 014/136] misc: sram: enable clock before registering regions
    Date
    From: Johan Hovold <johan@kernel.org>

    [ Upstream commit d5b9653dd2bb7a2b1c8cc783c5d3b607bbb6b271 ]

    Make sure to enable the clock before registering regions and exporting
    partitions to user space at which point we must be prepared for I/O.

    Fixes: ee895ccdf776 ("misc: sram: fix enabled clock leak on error path")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Reviewed-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/misc/sram.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
    index 679647713e36..74b183baf044 100644
    --- a/drivers/misc/sram.c
    +++ b/drivers/misc/sram.c
    @@ -391,23 +391,23 @@ static int sram_probe(struct platform_device *pdev)
    if (IS_ERR(sram->pool))
    return PTR_ERR(sram->pool);

    - ret = sram_reserve_regions(sram, res);
    - if (ret)
    - return ret;
    -
    sram->clk = devm_clk_get(sram->dev, NULL);
    if (IS_ERR(sram->clk))
    sram->clk = NULL;
    else
    clk_prepare_enable(sram->clk);

    + ret = sram_reserve_regions(sram, res);
    + if (ret)
    + goto err_disable_clk;
    +
    platform_set_drvdata(pdev, sram);

    init_func = of_device_get_match_data(&pdev->dev);
    if (init_func) {
    ret = init_func();
    if (ret)
    - goto err_disable_clk;
    + goto err_free_partitions;
    }

    dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",
    @@ -415,10 +415,11 @@ static int sram_probe(struct platform_device *pdev)

    return 0;

    +err_free_partitions:
    + sram_free_partitions(sram);
    err_disable_clk:
    if (sram->clk)
    clk_disable_unprepare(sram->clk);
    - sram_free_partitions(sram);

    return ret;
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:39    [W:4.264 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site