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 <[email protected]>
---
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
On Friday 22 June 2012 05:18 PM, Alexandre Courbot wrote:
> 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<[email protected]>
Reviewed-by: Laxman Dewangan <[email protected]>
Yes, I have sent similar patch in past.
[PATCH RESEND] gpio: fix bits conflict for gpio flags
Linus W has also Acked it and CCed to stable.
> Yes, I have sent similar patch in past.
> [PATCH RESEND] gpio: fix bits conflict for gpio flags
>
> Linus W has also Acked it and CCed to stable.
Ah, got your last version from two days ago. Hope this is going to be
merged this time, it seems like you have been pushing this fix for 2
months now.
Alex.