summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpiolib.c
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-12-13 18:34:01 +0100
committerGrant Likely <grant.likely@secretlab.ca>2012-04-05 21:24:06 -0700
commitfc3a1f04f5040255cbc086c419e4237f29f89f88 (patch)
tree3ece85d636a3ceeffb157b77ee51b4745cbdf2d9 /drivers/gpio/gpiolib.c
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
downloadlinux-fc3a1f04f5040255cbc086c419e4237f29f89f88.tar.gz
linux-fc3a1f04f5040255cbc086c419e4237f29f89f88.tar.bz2
linux-fc3a1f04f5040255cbc086c419e4237f29f89f88.zip
gpio: add flags to export GPIOs when requesting
Introduce new flags to automatically export GPIOs when using the convenience functions gpio_request_one() or gpio_request_array(). This eases support for custom boards where lots of GPIOs need to be exported for customer applications. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
-rw-r--r--drivers/gpio/gpiolib.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5a75510d66bb..566d0122d832 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1302,8 +1302,18 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
(flags & GPIOF_INIT_HIGH) ? 1 : 0);
if (err)
- gpio_free(gpio);
+ goto free_gpio;
+
+ if (flags & GPIOF_EXPORT) {
+ err = gpio_export(gpio, flags & GPIOF_EXPORT_CHANGEABLE);
+ if (err)
+ goto free_gpio;
+ }
+
+ return 0;
+ free_gpio:
+ gpio_free(gpio);
return err;
}
EXPORT_SYMBOL_GPL(gpio_request_one);