OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clk: clk-max77686: Clean clkdev lookup leak and use devm 

clk-max77686 never clean clkdev lookup at remove. This can cause
oops if clk-max77686 is removed and inserted again. Fix leak by
using new devm clkdev lookup registration. Simplify also error
path by using new devm_of_clk_add_hw_provider.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Matti Vaittinen 2018-12-07 13:10:15 +02:00 committed by Stephen Boyd
parent 3eee6c7d11
commit 8144e1e8ca
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/clk/clk-max77686.c
View File

@ -235,8 +235,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = clk_hw_register_clkdev(&max_clk_data->hw, ret = devm_clk_hw_register_clkdev(dev, &max_clk_data->hw,
max_clk_data->clk_idata.name, NULL); max_clk_data->clk_idata.name,
NULL);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to clkdev register: %d\n", ret); dev_err(dev, "Failed to clkdev register: %d\n", ret);
return ret; return ret;
@ -244,8 +245,8 @@ static int max77686_clk_probe(struct platform_device *pdev)
} }
if (parent->of_node) { if (parent->of_node) {
ret = of_clk_add_hw_provider(parent->of_node, of_clk_max77686_get, ret = devm_of_clk_add_hw_provider(dev, of_clk_max77686_get,
drv_data); drv_data);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to register OF clock provider: %d\n", dev_err(dev, "Failed to register OF clock provider: %d\n",
@ -261,27 +262,11 @@ static int max77686_clk_probe(struct platform_device *pdev)
1 << MAX77802_CLOCK_LOW_JITTER_SHIFT); 1 << MAX77802_CLOCK_LOW_JITTER_SHIFT);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to config low-jitter: %d\n", ret); dev_err(dev, "Failed to config low-jitter: %d\n", ret);
goto remove_of_clk_provider; return ret;
} }
} }
return 0; return 0;
remove_of_clk_provider:
if (parent->of_node)
of_clk_del_provider(parent->of_node);
return ret;
}
static int max77686_clk_remove(struct platform_device *pdev)
{
struct device *parent = pdev->dev.parent;
if (parent->of_node)
of_clk_del_provider(parent->of_node);
return 0;
} }
static const struct platform_device_id max77686_clk_id[] = { static const struct platform_device_id max77686_clk_id[] = {
@ -297,7 +282,6 @@ static struct platform_driver max77686_clk_driver = {
.name = "max77686-clk", .name = "max77686-clk",
}, },
.probe = max77686_clk_probe, .probe = max77686_clk_probe,
.remove = max77686_clk_remove,
.id_table = max77686_clk_id, .id_table = max77686_clk_id,
}; };