Merge branch 'master' of /home/wd/git/u-boot/master/

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 8a812379a6e3295ba5765c0c7dfbf146aa006bc0..634d03684b4365362e31d38c42cb395bfaea9aa7 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -653,7 +653,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        }
 
        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)) {