summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2017-06-28 15:53:45 +0200
committerStephen Boyd <sboyd@codeaurora.org>2017-06-29 18:47:35 -0700
commit2b286b09a048df80fd5f7dfc5057c2837679a1ab (patch)
treed661666d275cac25ac76828affa1983784dde5e9 /drivers/clk
parentb3b02eac33eddda88992962d920b46348bb086da (diff)
downloadlinux-2b286b09a048df80fd5f7dfc5057c2837679a1ab.tar.gz
linux-2b286b09a048df80fd5f7dfc5057c2837679a1ab.tar.bz2
linux-2b286b09a048df80fd5f7dfc5057c2837679a1ab.zip
clk: scpi: error when clock fails to register
Current implementation of scpi_clk_add just print a warning when clock fails to register but then keep going as if nothing happened. The provider is then registered with bogus data. This may latter lead to an Oops in __clk_create_clk when hlist_add_head(&clk->clks_node, &hw->core->clks) is called. This patch fixes the issue and errors if a clock fails to register. Fixes: cd52c2a4b5c4 ("clk: add support for clocks provided by SCP(System Control Processor)") Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk-scpi.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/clk/clk-scpi.c b/drivers/clk/clk-scpi.c
index 8ad458b5ad6e..25854722810e 100644
--- a/drivers/clk/clk-scpi.c
+++ b/drivers/clk/clk-scpi.c
@@ -245,10 +245,12 @@ static int scpi_clk_add(struct device *dev, struct device_node *np,
sclk->id = val;
err = scpi_clk_ops_init(dev, match, sclk, name);
- if (err)
+ if (err) {
dev_err(dev, "failed to register clock '%s'\n", name);
- else
- dev_dbg(dev, "Registered clock '%s'\n", name);
+ return err;
+ }
+
+ dev_dbg(dev, "Registered clock '%s'\n", name);
clk_data->clk[idx] = sclk;
}