summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-13 15:59:21 +0100
committerWolfgang Denk <wd@denx.de>2008-01-13 15:59:21 +0100
commit1a0a7ced39fcf1be5ac26e4c865c96aecb8c2d04 (patch)
treeafd52e5079c8714891492d2fab217be1a25255b4
parent8225d1e3ac0ab147cdde4b0042812583380afb8a (diff)
parent0a1e03bcadc7734688a21e8dd2e46a4f608193c0 (diff)
downloadblackbird-obmc-uboot-1a0a7ced39fcf1be5ac26e4c865c96aecb8c2d04.tar.gz
blackbird-obmc-uboot-1a0a7ced39fcf1be5ac26e4c865c96aecb8c2d04.zip
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
-rw-r--r--common/cmd_nand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index b248a2cdb2..8d6c959584 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -350,10 +350,10 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} else if (s != NULL && !strcmp(s, ".oob")) {
/* read out-of-band data */
if (read)
- ret = nand->read_oob(nand, off, size, &size,
+ ret = nand->read_oob(nand, off, size, (size_t *) &size,
(u_char *) addr);
else
- ret = nand->write_oob(nand, off, size, &size,
+ ret = nand->write_oob(nand, off, size, (size_t *) &size,
(u_char *) addr);
} else {
if (read)
OpenPOWER on IntegriCloud