diff options
| author | Bastian Krause <bst@pengutronix.de> | 2022-05-11 14:31:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-12 09:11:00 +0200 |
| commit | 4fe5ea1f3ae64818b67eed97bc615ab84f7d2f72 (patch) | |
| tree | 7516d1f4090eda29fc1524016f7675bc19664008 /drivers/clk | |
| parent | 9c5149713e7f9964183ab5b424950ba4291a63a1 (diff) | |
| download | barebox-4fe5ea1f3ae64818b67eed97bc615ab84f7d2f72.tar.gz barebox-4fe5ea1f3ae64818b67eed97bc615ab84f7d2f72.tar.xz | |
clk: handle NULL args in clk_{g,s}et_parent() v2
Accidently applied v1 of this patch. This updates to v2.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220511123139.2767034-1-bst@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index efb5d4ad4a..52e309e877 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -230,7 +230,7 @@ int clk_set_parent(struct clk *clk, struct clk *newparent) { struct clk_hw *hw; int i, ret; - struct clk *curparent; + struct clk *curparent = clk_get_parent(clk); if (!clk || !newparent) return 0; @@ -257,8 +257,6 @@ int clk_set_parent(struct clk *clk, struct clk *newparent) if (i == clk->num_parents) return -EINVAL; - curparent = clk_get_parent(clk); - if (clk->enable_count) clk_enable(newparent); @@ -292,7 +290,7 @@ struct clk *clk_get_parent(struct clk *clk) struct clk_hw *hw; int idx; - if (IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return clk; if (!clk->num_parents) |