projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-05-07-more-kconfig-migrations'
[oweals/u-boot.git]
/
cmd
/
gpio.c
diff --git
a/cmd/gpio.c
b/cmd/gpio.c
index 67eef83c951c73326e3a458c4417b51a70a1c172..408a942455b58627a81107f3145fe08e33fbeb9f 100644
(file)
--- a/
cmd/gpio.c
+++ b/
cmd/gpio.c
@@
-10,7
+10,9
@@
#include <command.h>
#include <errno.h>
#include <dm.h>
#include <command.h>
#include <errno.h>
#include <dm.h>
+#include <malloc.h>
#include <asm/gpio.h>
#include <asm/gpio.h>
+#include <linux/err.h>
__weak int name_to_gpio(const char *name)
{
__weak int name_to_gpio(const char *name)
{
@@
-246,7
+248,12
@@
static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (ret != -EBUSY)
gpio_free(gpio);
if (ret != -EBUSY)
gpio_free(gpio);
- return CMD_RET_SUCCESS;
+ /*
+ * Whilst wrong, the legacy gpio input command returns the pin
+ * value, or CMD_RET_FAILURE (which is indistinguishable from a
+ * valid pin value).
+ */
+ return (sub_cmd == GPIOC_INPUT) ? value : CMD_RET_SUCCESS;
err:
if (ret != -EBUSY)
err:
if (ret != -EBUSY)