From cc700045aeb7c6a6785c2a62d8359f5fbc2f0575 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Wed, 12 Dec 2012 15:22:44 +0100
Subject: [PATCH] --- yaml --- r: 348166 b: refs/heads/master c:
 c62b2b3448330ce1056d7730a01db4e19c95cfca h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/pinctrl/pinctrl-at91.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 420fe577493e..d4b25faccc3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9cfddd90d03b9000f1dd969149c0d091101dcef
+refs/heads/master: c62b2b3448330ce1056d7730a01db4e19c95cfca
diff --git a/trunk/drivers/pinctrl/pinctrl-at91.c b/trunk/drivers/pinctrl/pinctrl-at91.c
index c5e757157183..bff54bfaff43 100644
--- a/trunk/drivers/pinctrl/pinctrl-at91.c
+++ b/trunk/drivers/pinctrl/pinctrl-at91.c
@@ -265,7 +265,7 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
 	/* create mux map */
 	parent = of_get_parent(np);
 	if (!parent) {
-		kfree(new_map);
+		devm_kfree(pctldev->dev, new_map);
 		return -EINVAL;
 	}
 	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;