| commit | b8e32e898dbcc487e0811d6a46056c7e92de5055 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Mon Oct 18 22:23:36 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Mon Oct 18 22:23:36 2010 +0200 |
| tree | 5f24f632e081cddda7c55b1934b145f2ebf130e8 | |
| parent | cffb904bd56654a2ce6ab3db254d8767785e1226 [diff] | |
| parent | 6587e3e0f8e0e05b7988b80a9c193ff81657a410 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 8a81237..634d036 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c
@@ -653,7 +653,7 @@ } if (strcmp(cmd, "unlock") == 0) { - if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0) + if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size) < 0) return 1; if (!nand_unlock(&nand_info[dev], off, size)) {