clk: samsung: fix error handling in pll register functions

A patch from »Convert S3C2416 ad S3C2443 to common clock framework« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Sat, 6 Jul 2013 17:15:49 +0200

Commit-Message

kmalloc has its own error reporting when the allocation fails and the register functions also should return the correct ERR_PTR(-ENOMEM) when it happens. Signed-off-by: Heiko Stuebner <heiko@...>

Patch-Comment

drivers/clk/samsung/clk-pll.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)

Statistics

  • 10 lines added
  • 20 lines removed

Changes

------------------------ drivers/clk/samsung/clk-pll.c -------------------------
index 9153e46..0afaec6 100644
@@ -79,10 +79,8 @@ struct clk * __init samsung_clk_register_pll35xx(const char *name,
struct clk_init_data init;
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("%s: could not allocate pll clk %s\n", __func__, name);
- return NULL;
- }
+ if (!pll)
+ return ERR_PTR(-ENOMEM);
init.name = name;
init.ops = &samsung_pll35xx_clk_ops;
@@ -153,10 +151,8 @@ struct clk * __init samsung_clk_register_pll36xx(const char *name,
struct clk_init_data init;
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("%s: could not allocate pll clk %s\n", __func__, name);
- return NULL;
- }
+ if (!pll)
+ return ERR_PTR(-ENOMEM);
init.name = name;
init.ops = &samsung_pll36xx_clk_ops;
@@ -227,10 +223,8 @@ struct clk * __init samsung_clk_register_pll45xx(const char *name,
struct clk_init_data init;
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("%s: could not allocate pll clk %s\n", __func__, name);
- return NULL;
- }
+ if (!pll)
+ return ERR_PTR(-ENOMEM);
init.name = name;
init.ops = &samsung_pll45xx_clk_ops;
@@ -308,10 +302,8 @@ struct clk * __init samsung_clk_register_pll46xx(const char *name,
struct clk_init_data init;
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("%s: could not allocate pll clk %s\n", __func__, name);
- return NULL;
- }
+ if (!pll)
+ return ERR_PTR(-ENOMEM);
init.name = name;
init.ops = &samsung_pll46xx_clk_ops;
@@ -385,10 +377,8 @@ struct clk * __init samsung_clk_register_pll2550x(const char *name,
struct clk_init_data init;
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("%s: could not allocate pll clk %s\n", __func__, name);
- return NULL;
- }
+ if (!pll)
+ return ERR_PTR(-ENOMEM);
init.name = name;
init.ops = &samsung_pll2550x_clk_ops;
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...