Commit 05da40eb authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk driver fixes from Stephen Boyd:
 "A handful of clk driver fixes. Mostly they're for error paths or
  improper memory allocations sizes. Nothing as exciting as a wildfire"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: qcom: lpass: Correct goto target in lpass_core_sc7180_probe()
  clk: versatile: Add of_node_put() before return statement
  clk: bcm: dvp: Select the reset framework
  clk: rockchip: Fix initialization of mux_pll_src_4plls_p
  clk: davinci: Use the correct size when allocating memory
parents 6279e774 d2249bf2
...@@ -5,6 +5,7 @@ config CLK_BCM2711_DVP ...@@ -5,6 +5,7 @@ config CLK_BCM2711_DVP
depends on ARCH_BCM2835 ||COMPILE_TEST depends on ARCH_BCM2835 ||COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
default ARCH_BCM2835 default ARCH_BCM2835
select RESET_CONTROLLER
select RESET_SIMPLE select RESET_SIMPLE
help help
Enable common clock framework support for the Broadcom BCM2711 Enable common clock framework support for the Broadcom BCM2711
......
...@@ -491,7 +491,7 @@ struct clk *davinci_pll_clk_register(struct device *dev, ...@@ -491,7 +491,7 @@ struct clk *davinci_pll_clk_register(struct device *dev,
parent_name = postdiv_name; parent_name = postdiv_name;
} }
pllen = kzalloc(sizeof(*pllout), GFP_KERNEL); pllen = kzalloc(sizeof(*pllen), GFP_KERNEL);
if (!pllen) { if (!pllen) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_unregister_postdiv; goto err_unregister_postdiv;
......
...@@ -420,17 +420,18 @@ static int lpass_core_sc7180_probe(struct platform_device *pdev) ...@@ -420,17 +420,18 @@ static int lpass_core_sc7180_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
ret = pm_clk_create(&pdev->dev); ret = pm_clk_create(&pdev->dev);
if (ret) if (ret)
return ret; goto disable_pm_runtime;
ret = pm_clk_add(&pdev->dev, "iface"); ret = pm_clk_add(&pdev->dev, "iface");
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to acquire iface clock\n"); dev_err(&pdev->dev, "failed to acquire iface clock\n");
goto disable_pm_runtime; goto destroy_pm_clk;
} }
ret = -EINVAL;
clk_probe = of_device_get_match_data(&pdev->dev); clk_probe = of_device_get_match_data(&pdev->dev);
if (!clk_probe) if (!clk_probe)
return -EINVAL; goto destroy_pm_clk;
ret = clk_probe(pdev); ret = clk_probe(pdev);
if (ret) if (ret)
......
...@@ -137,7 +137,7 @@ PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" }; ...@@ -137,7 +137,7 @@ PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" };
PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" }; PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" };
PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu", "hdmiphy_aclk_cpu" }; PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu", "hdmiphy_aclk_cpu" };
PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy" "usb480m" }; PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy", "usb480m" };
PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "hdmiphy" }; PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "hdmiphy" };
PNAME(mux_pll_src_2plls_p) = { "cpll", "gpll" }; PNAME(mux_pll_src_2plls_p) = { "cpll", "gpll" };
PNAME(mux_sclk_hdmi_cec_p) = { "cpll", "gpll", "xin24m" }; PNAME(mux_sclk_hdmi_cec_p) = { "cpll", "gpll", "xin24m" };
......
...@@ -109,9 +109,11 @@ static int integrator_impd1_clk_probe(struct platform_device *pdev) ...@@ -109,9 +109,11 @@ static int integrator_impd1_clk_probe(struct platform_device *pdev)
for_each_available_child_of_node(np, child) { for_each_available_child_of_node(np, child) {
ret = integrator_impd1_clk_spawn(dev, np, child); ret = integrator_impd1_clk_spawn(dev, np, child);
if (ret) if (ret) {
of_node_put(child);
break; break;
} }
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment