[PATCH] gpio: gpiolib: fix conflicting flag values

[Alexandre Courbot]

Commits aca5ce14 and 25553ff0 introduced two new GPIOF_OPEN_DRAIN and
GPIOF_OPEN_SOURCE flags to gpiolib. Unfortunately they happen to be the
same as GPIOF_EXPORT and GPIOF_EXPORT_CHANGEABLE, which causes all gpios
exported at request time to end up open drain and/or open source.

Resolve the conflict by affecting free flags to GPIOF_EXPORT and
GPIOF_EXPORT_CHANGEABLE.

Signed-off-by: Alexandre Courbot <acourbot@xxxxxxxxxx>
---
 include/linux/gpio.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index f07fc2d..2e31e8b 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -22,8 +22,8 @@
 /* Gpio pin is open source */
 #define GPIOF_OPEN_SOURCE	(1 << 3)
 
-#define GPIOF_EXPORT		(1 << 2)
-#define GPIOF_EXPORT_CHANGEABLE	(1 << 3)
+#define GPIOF_EXPORT		(1 << 4)
+#define GPIOF_EXPORT_CHANGEABLE	(1 << 5)
 #define GPIOF_EXPORT_DIR_FIXED	(GPIOF_EXPORT)
 #define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE)
 
-- 
1.7.11

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/