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