From 8f62139afe9e92818e77a40b6d86d5bfb45706cf Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sat, 4 Aug 2012 18:50:47 +0200
Subject: [PATCH] --- yaml --- r: 321452 b: refs/heads/master c:
 75c353ecacf54dbcca5e2e4388088893aac0fc34 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/pinctrl/pinctrl-nomadik.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99c522ee33f4..99d1be885c89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e406fe4aebee50b18176947a68aab6f519843de
+refs/heads/master: 75c353ecacf54dbcca5e2e4388088893aac0fc34
diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c
index 53b0d49a7a1c..ec6ac501b23a 100644
--- a/trunk/drivers/pinctrl/pinctrl-nomadik.c
+++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c
@@ -1731,7 +1731,6 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
 	for (i = 0; i < npct->soc->gpio_num_ranges; i++) {
 		if (!nmk_gpio_chips[i]) {
 			dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i);
-			devm_kfree(&pdev->dev, npct);
 			return -EPROBE_DEFER;
 		}
 		npct->soc->gpio_ranges[i].gc = &nmk_gpio_chips[i]->chip;