---

yaml --- r: 310810 b: refs/heads/master c: c71157c h: refs/heads/master v: v3
git-mirror · Jun 12, 2012 · 4fecdfd · 4fecdfd
1 parent 841ab92
commit 4fecdfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a86a5f8abb33956446ae31b1e9c149d7b2d1d21
+refs/heads/master: c71157c54a4f86e4f355dc6952268e8536013502
diff --git a/trunk/drivers/pinctrl/pinctrl-imx.c b/trunk/drivers/pinctrl/pinctrl-imx.c
@@ -173,8 +173,10 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 	/* create mux map */
 	parent = of_get_parent(np);
-	if (!parent)
+	if (!parent) {
+		kfree(new_map);
 		return -EINVAL;
+	}
 	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
 	new_map[0].data.mux.function = parent->name;
 	new_map[0].data.mux.group = np->name;