Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / gpio / devres.c

diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c
index d21a9ff38551fa6a485c8805eb1cafd337cf92de..9e9947cb86a3d4fe29bb018987176275d4476e2c 100644 (file)
--- a/drivers/gpio/devres.c
+++ b/drivers/gpio/devres.c
@@ -112,8 +112,7 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio,
 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);