omap4/5: Use CPUDIR for .lds script

[u-boot] / common / cmd_gpio.c

diff --git a/common/cmd_gpio.c b/common/cmd_gpio.c
index 9c9de28e4a6764f5a2671fb37be31d3fa8d72317..47eee89221fff34bb704a5fc5b6269f72234da19 100644 (file)
--- a/common/cmd_gpio.c
+++ b/common/cmd_gpio.c
@@ -38,7 +38,7 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        if (argc != 3)
  show_usage:
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        str_cmd = argv[1];
        str_gpio = argv[2];
 
@@ -57,7 +57,10 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                goto show_usage;
 
        /* grab the pin before we tweak it */
-       gpio_request(gpio, "cmd_gpio");
+       if (gpio_request(gpio, "cmd_gpio")) {
+               printf("gpio: requesting pin %u failed\n", gpio);
+               return -1;
+       }
 
        /* finally, let's do it: set direction and exec command */
        if (sub_cmd == GPIO_INPUT) {