TX6 Release 2013-04-22

[karo-tx-uboot.git] / common / cmd_sata.c

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index 6a9282139ef7f228dec1cbe4bb7c983bb115b4aa..69f3139ee3507cc3fa833dd011c58cab896f2678 100644 (file)
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -31,7 +31,7 @@
 #include <part.h>
 #include <sata.h>
 
-int sata_curr_device = -1;
+static int sata_curr_device = -1;
 block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 int __sata_initialize(void)
@@ -53,7 +53,7 @@ int __sata_initialize(void)
                rc = init_sata(i);
                if (!rc) {
                        rc = scan_sata(i);
-                       if ((sata_dev_desc[i].lba > 0) &&
+                       if (!rc && (sata_dev_desc[i].lba > 0) &&
                                (sata_dev_desc[i].blksz > 0))
                                init_part(&sata_dev_desc[i]);
                }
@@ -70,7 +70,7 @@ block_dev_desc_t *sata_get_dev(int dev)
 }
 #endif
 
-int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rc = 0;
 
@@ -85,7 +85,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        switch (argc) {
        case 0:
        case 1:
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        case 2:
                if (strncmp(argv[1],"inf", 3) == 0) {
                        int i;
@@ -122,7 +122,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        }
                        return rc;
                }
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        case 3:
                if (strncmp(argv[1], "dev", 3) == 0) {
                        int dev = (int)simple_strtoul(argv[2], NULL, 10);
@@ -153,7 +153,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        }
                        return rc;
                }
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        default: /* at least 4 args */
                if (strcmp(argv[1], "read") == 0) {
@@ -189,7 +189,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                n, (n == cnt) ? "OK" : "ERROR");
                        return (n == cnt) ? 0 : 1;
                } else {
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
                }
 
                return rc;