If memory allocation for the parents array or the parent string fails, then
fail the registration immediately instead of calling clk_register and
hoping it fails there.
Return -ENOMEM on failure.
Signed-off-by: Saravana Kannan <redacted>
Cc: Mike Turquette <redacted>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Rob Herring <redacted>
Cc: Russell King <redacted>
Cc: Jeremy Kerr <redacted>
Cc: Thomas Gleixner <redacted>
Cc: Arnd Bergman <redacted>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Jamie Iles <redacted>
Cc: Richard Zhao <redacted>
Cc: Saravana Kannan <redacted>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Mark Brown <redacted>
Cc: Linus Walleij <redacted>
Cc: Stephen Boyd <redacted>
Cc: Amit Kucheria <redacted>
Cc: Deepak Saxena <redacted>
Cc: Grant Likely <redacted>
---
There are still some memory free issues when clk_register() fails, but I will
fix it when I fixed the other register() fns to return ENOMEM of alloc
failure instead of a NULL.
drivers/clk/clk-fixed-rate.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk-fixed-rate.c b/drivers/clk/clk-fixed-rate.c
index 90c79fb..6423ae9 100644
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
@@ -61,22 +61,26 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,
parent_names = kmalloc(sizeof(char *), GFP_KERNEL);
if (! parent_names)
- goto out;
+ goto fail_ptr;
len = sizeof(char) * strlen(parent_name);
parent_names[0] = kmalloc(len, GFP_KERNEL);
if (!parent_names[0])
- goto out;
+ goto fail_str;
strncpy(parent_names[0], parent_name, len);
}
-out:
return clk_register(dev, name,
&clk_fixed_rate_ops, &fixed->hw,
parent_names,
(parent_name ? 1 : 0),
flags);
+fail_str:
+ kfree(parent_names);
+fail_ptr:
+ kfree(fixed);
+ return ERR_PTR(-ENOMEM);
}
--
1.7.8.3