From 6fafebe01d53602d24b30c7740075b4570e717d4 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 3 May 2012 18:15:14 +0100
Subject: [PATCH] --- yaml --- r: 304077 b: refs/heads/master c:
 a85990b3b126e4fa443f1cbc18250a92c144ac27 h: refs/heads/master i:   304075:
 bf4ccc00b19fdd80922bdcf50984c0d49af1ce7c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/gpio/devres.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5dbd0b8eec0e..bbfe67e662a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d926d0e4c74cfcb42a05e91d1cdf698b41e1e118
+refs/heads/master: a85990b3b126e4fa443f1cbc18250a92c144ac27
diff --git a/trunk/drivers/gpio/devres.c b/trunk/drivers/gpio/devres.c
index 3dd29399cef5..8950f6261bbb 100644
--- a/trunk/drivers/gpio/devres.c
+++ b/trunk/drivers/gpio/devres.c
@@ -83,8 +83,7 @@ EXPORT_SYMBOL(devm_gpio_request);
 void devm_gpio_free(struct device *dev, unsigned int gpio)
 {
 
-	WARN_ON(devres_destroy(dev, devm_gpio_release, devm_gpio_match,
+	WARN_ON(devres_release(dev, devm_gpio_release, devm_gpio_match,
 		&gpio));
-	gpio_free(gpio);
 }
 EXPORT_SYMBOL(devm_gpio_free);