at91: Enabeling USB host on meesc board

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

diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index 05893f5be57fa7c93e1e5c920295f092a92bc3fe..7692ac7716d2bbcc472892cc9e649c02dd731aae 100644 (file)
--- a/common/cmd_ubi.c
+++ b/common/cmd_ubi.c
@@ -190,7 +190,7 @@ static int ubi_remove_vol(char *volume)
 {
        int i, err, reserved_pebs;
        int found = 0, vol_id = 0;
-       struct ubi_volume *vol;
+       struct ubi_volume *vol = NULL;
 
        for (i = 0; i < ubi->vtbl_slots; i++) {
                vol = ubi->volumes[i];
@@ -436,16 +436,14 @@ static int ubi_dev_scan(struct mtd_info *info, char *ubidev,
        return 0;
 }
 
-static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        size_t size = 0;
        ulong addr = 0;
        int err = 0;
 
-       if (argc < 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 2)
+               return cmd_usage(cmdtp);
 
        if (mtdparts_init() != 0) {
                printf("Error initializing mtdparts!\n");
@@ -471,10 +469,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        return 0;
                }
 
-               if (argc < 3) {
-                       cmd_usage(cmdtp);
-                       return 1;
-               }
+               if (argc < 3)
+                       return cmd_usage(cmdtp);
 
                /* todo: get dev number for NAND... */
                ubi_dev.nr = 0;
@@ -602,7 +598,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return -1;
 }
 
-U_BOOT_CMD(ubi, 6, 1, do_ubi,
+U_BOOT_CMD(
+       ubi, 6, 1, do_ubi,
        "ubi commands",
        "part [part] [offset]\n"
                " - Show or set current partition (with optional VID"
@@ -618,7 +615,7 @@ U_BOOT_CMD(ubi, 6, 1, do_ubi,
        "ubi remove[vol] volume"
                " - Remove volume\n"
        "[Legends]\n"
-       " volume: charater name\n"
-       " size: KiB, MiB, GiB, and bytes\n"
+       " volume: character name\n"
+       " size: specified in bytes\n"
        " type: s[tatic] or d[ynamic] (default=dynamic)"
 );