[03/10] pinctrl: imx: Return directly after a failed devm_kcalloc() in imx_pinctrl_parse_functions()

Message ID 786ef7b5-f889-7951-7479-e9e1f901f041@users.sourceforge.net
State New
Headers show

Commit Message

SF Markus Elfring April 14, 2017, 9:11 a.m.
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 13 Apr 2017 15:12:20 +0200

Add a check for a null pointer and return an error code
after a memory allocation failure was detected.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/pinctrl/freescale/pinctrl-imx.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 975ed40cb774..f835e8210ace 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -585,6 +585,8 @@  static int imx_pinctrl_parse_functions(struct device_node *np,
 					 func->num_group_names,
 					 sizeof(*func->group_names),
 					 GFP_KERNEL);
+	if (!func->group_names)
+		return -ENOMEM;
 
 	for_each_child_of_node(np, child) {
 		func->group_names[i] = child->name;