Skip to content

Commit

Permalink
treewide: gpio-export: add error handling
Browse files Browse the repository at this point in the history
Check if the GPIO is valid (or set at all). If no GPIO is set in the
devicetree, a gpiolib related kernel warning + stacktrace is shown during
boot and gpio-export reports GPIOs as exported albeit none really is.

Signed-off-by: Mathias Kresin <[email protected]>
  • Loading branch information
mkresin committed Jun 28, 2018
1 parent 750e4b6 commit a570933
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: John Crispin <[email protected]>

#include "gpiolib.h"

@@ -506,3 +508,69 @@ void of_gpiochip_remove(struct gpio_chip
@@ -506,3 +508,71 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
Expand Down Expand Up @@ -56,6 +56,8 @@ Signed-off-by: John Crispin <[email protected]>
+ enum of_gpio_flags of_flags;
+
+ gpio = of_get_gpio_flags(cnp, i, &of_flags);
+ if (!gpio_is_valid(gpio))
+ return gpio;
+
+ if (of_flags == OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: John Crispin <[email protected]>

#include "gpiolib.h"

@@ -506,3 +508,73 @@ void of_gpiochip_remove(struct gpio_chip
@@ -506,3 +508,75 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
Expand Down Expand Up @@ -58,6 +58,8 @@ Signed-off-by: John Crispin <[email protected]>
+ enum of_gpio_flags of_flags;
+
+ gpio = of_get_gpio_flags(cnp, i, &of_flags);
+ if (!gpio_is_valid(gpio))
+ return gpio;
+
+ if (of_flags == OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: John Crispin <[email protected]>

#include "gpiolib.h"

@@ -506,3 +508,69 @@ void of_gpiochip_remove(struct gpio_chip
@@ -506,3 +508,71 @@ void of_gpiochip_remove(struct gpio_chip
gpiochip_remove_pin_ranges(chip);
of_node_put(chip->of_node);
}
Expand Down Expand Up @@ -56,6 +56,8 @@ Signed-off-by: John Crispin <[email protected]>
+ enum of_gpio_flags of_flags;
+
+ gpio = of_get_gpio_flags(cnp, i, &of_flags);
+ if (!gpio_is_valid(gpio))
+ return gpio;
+
+ if (of_flags == OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
Expand Down

0 comments on commit a570933

Please sign in to comment.