Merge with /home/mk/git/u-boot-generic_ohci#generic_ohci

[oweals/u-boot.git] / drivers / nand / nand_util.c

diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c
index 5a8e58a741ca917481466440e7ae0a8598400c7a..10bf03659ede94c2827b0bd28967f52764587a91 100644 (file)
--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@@ -83,15 +83,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
 
        erase.mtd = meminfo;
        erase.len  = meminfo->erasesize;
-       if (opts->offset == 0 && opts->length == 0) {
-               /* erase complete chip */
-               erase.addr = 0;
-               erase_length = meminfo->size;
-       } else {
-               /* erase specified region */
-               erase.addr = opts->offset;
-               erase_length = opts->length;
-       }
+       erase.addr = opts->offset;
+       erase_length = opts->length;
 
        isNAND = meminfo->type == MTD_NANDFLASH ? 1 : 0;
 
@@ -170,9 +163,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
                        if (ret > 0) {
                                if (!opts->quiet)
                                        printf("\rSkipping bad block at  "
-                                               "0x%08x                   "
-                                               "                         \n",
-                                               erase.addr);
+                                              "0x%08x                   "
+                                              "                         \n",
+                                              erase.addr);
                                continue;
 
                        } else if (ret < 0) {