projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clk: defer clk_gets on orphan clocks
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clk
/
clkdev.c
diff --git
a/drivers/clk/clkdev.c
b/drivers/clk/clkdev.c
index 779b6ff0c7ad4040a680a2155964bd3016363767..a7e8bbe53868774765870496fb8f6fcd8a07d026 100644
(file)
--- a/
drivers/clk/clkdev.c
+++ b/
drivers/clk/clkdev.c
@@
-43,7
+43,7
@@
static struct clk *__of_clk_get(struct device_node *np, int index,
if (rc)
return ERR_PTR(rc);
if (rc)
return ERR_PTR(rc);
- clk = __of_clk_get_from_provider(&clkspec, dev_id, con_id);
+ clk = __of_clk_get_from_provider(&clkspec, dev_id, con_id
, true
);
of_node_put(clkspec.np);
return clk;
of_node_put(clkspec.np);
return clk;
@@
-177,7
+177,7
@@
struct clk *clk_get_sys(const char *dev_id, const char *con_id)
if (!cl)
goto out;
if (!cl)
goto out;
- clk = __clk_create_clk(cl->clk_hw, dev_id, con_id);
+ clk = __clk_create_clk(cl->clk_hw, dev_id, con_id
, false
);
if (IS_ERR(clk))
goto out;
if (IS_ERR(clk))
goto out;