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);