Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Matti Vaittinen and committed by
Stephen Boyd
8144e1e8 3eee6c7d

+6 -22
+6 -22
drivers/clk/clk-max77686.c
··· 235 235 return ret; 236 236 } 237 237 238 - ret = clk_hw_register_clkdev(&max_clk_data->hw, 239 - max_clk_data->clk_idata.name, NULL); 238 + ret = devm_clk_hw_register_clkdev(dev, &max_clk_data->hw, 239 + max_clk_data->clk_idata.name, 240 + NULL); 240 241 if (ret < 0) { 241 242 dev_err(dev, "Failed to clkdev register: %d\n", ret); 242 243 return ret; ··· 245 244 } 246 245 247 246 if (parent->of_node) { 248 - ret = of_clk_add_hw_provider(parent->of_node, of_clk_max77686_get, 249 - drv_data); 247 + ret = devm_of_clk_add_hw_provider(dev, of_clk_max77686_get, 248 + drv_data); 250 249 251 250 if (ret < 0) { 252 251 dev_err(dev, "Failed to register OF clock provider: %d\n", ··· 262 261 1 << MAX77802_CLOCK_LOW_JITTER_SHIFT); 263 262 if (ret < 0) { 264 263 dev_err(dev, "Failed to config low-jitter: %d\n", ret); 265 - goto remove_of_clk_provider; 264 + return ret; 266 265 } 267 266 } 268 - 269 - return 0; 270 - 271 - remove_of_clk_provider: 272 - if (parent->of_node) 273 - of_clk_del_provider(parent->of_node); 274 - 275 - return ret; 276 - } 277 - 278 - static int max77686_clk_remove(struct platform_device *pdev) 279 - { 280 - struct device *parent = pdev->dev.parent; 281 - 282 - if (parent->of_node) 283 - of_clk_del_provider(parent->of_node); 284 267 285 268 return 0; 286 269 } ··· 282 297 .name = "max77686-clk", 283 298 }, 284 299 .probe = max77686_clk_probe, 285 - .remove = max77686_clk_remove, 286 300 .id_table = max77686_clk_id, 287 301 }; 288 302