iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: sram: enable clock before registering regions

Browse Source 
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: ee895ccdf7 ("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>
This commit is contained in:
Johan Hovold
2018-07-03 12:05:48 +02:00
committed by Greg Kroah-Hartman
parent f294d00961
commit d5b9653dd2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/sram.c
View File

@ -391,23 +391,23 @@ static int sram_probe(struct platform_device *pdev)
if (IS_ERR(sram->pool)) if (IS_ERR(sram->pool))
return PTR_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); sram->clk = devm_clk_get(sram->dev, NULL);
if (IS_ERR(sram->clk)) if (IS_ERR(sram->clk))
sram->clk = NULL; sram->clk = NULL;
else else
clk_prepare_enable(sram->clk); clk_prepare_enable(sram->clk);
ret = sram_reserve_regions(sram, res);
if (ret)
goto err_disable_clk;
platform_set_drvdata(pdev, sram); platform_set_drvdata(pdev, sram);
init_func = of_device_get_match_data(&pdev->dev); init_func = of_device_get_match_data(&pdev->dev);
if (init_func) { if (init_func) {
ret = init_func(); ret = init_func();
if (ret) if (ret)
goto err_disable_clk; goto err_free_partitions;
} }
dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n", 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; return 0;
err_free_partitions:
sram_free_partitions(sram);
err_disable_clk: err_disable_clk:
if (sram->clk) if (sram->clk)
clk_disable_unprepare(sram->clk); clk_disable_unprepare(sram->clk);
sram_free_partitions(sram);
return ret; return ret;
} }