diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-15 08:16:13 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-15 08:16:13 -0800 |
commit | 36331641eb4296f0c62f4bf1e320d8c30bc6a863 (patch) | |
tree | 301cb332c2394a9c5b7066065accd8f1194fde13 /drivers/clk/spear/clk-frac-synth.c | |
parent | c1ea839c41d049604a3f64ef72712d1c7c6639d0 (diff) | |
parent | 98c58f7d176a025365219bf51079a004cb70cc7c (diff) | |
download | op-kernel-dev-36331641eb4296f0c62f4bf1e320d8c30bc6a863.zip op-kernel-dev-36331641eb4296f0c62f4bf1e320d8c30bc6a863.tar.gz |
Merge branch 'clk-cleanup' into clk-next
* clk-cleanup:
clk: kona-setup: Delete error messages for failed memory allocations
ARC: clk: fix spelling mistake: "configurarion" -> "configuration"
clk: cdce925: remove redundant check for non-null parent_name
clk: versatile: Improve sizeof() usage
clk: versatile: Delete error messages for failed memory allocations
clk: ux500: Improve sizeof() usage
clk: ux500: Delete error messages for failed memory allocations
clk: spear: Delete error messages for failed memory allocations
clk: ti: Delete error messages for failed memory allocations
clk: mmp: Adjust checks for NULL pointers
clk: mmp: Use common error handling code in mmp_clk_register_mix()
clk: mmp: Delete error messages for failed memory allocations
clk: clk-xgene: Adjust six checks for null pointers
clk: clk-xgene: Delete error messages for failed memory allocations
clk: clk-u300: Fix a typo in two comment lines
clk: clk-u300: Add some spaces for better code readability
clk: clk-u300: Improve sizeof() usage
clk: clk-u300: Delete error messages for failed memory allocations
clk: clk-mux: Improve a size determination in clk_hw_register_mux_table()
clk: clk-mux: Delete an error message for a failed memory allocation
Diffstat (limited to 'drivers/clk/spear/clk-frac-synth.c')
-rw-r--r-- | drivers/clk/spear/clk-frac-synth.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c index eaf970b..229c96d 100644 --- a/drivers/clk/spear/clk-frac-synth.c +++ b/drivers/clk/spear/clk-frac-synth.c @@ -136,10 +136,8 @@ struct clk *clk_register_frac(const char *name, const char *parent_name, } frac = kzalloc(sizeof(*frac), GFP_KERNEL); - if (!frac) { - pr_err("could not allocate frac clk\n"); + if (!frac) return ERR_PTR(-ENOMEM); - } /* struct clk_frac assignments */ frac->reg = reg; |