| commit | 93e655a41287de51ff785593c0ab2ae54383b4a3 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Mon Oct 18 22:29:40 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Mon Oct 18 22:29:40 2010 +0200 |
| tree | 6c400cc3e24e26656daed2b03bdb95134f0660e4 | |
| parent | b8e32e898dbcc487e0811d6a46056c7e92de5055 [diff] | |
| parent | bf5ce1eb6c4638d631a11d3dc546e9b0df441898 [diff] |
Merge branch 'master' of /home/wd/git/u-boot/master/
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)) {