summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-08-25 22:57:10 +0200
committerWolfgang Denk <wd@denx.de>2009-08-25 22:57:10 +0200
commit68ccfa482be0c7e4aa18285aceb214ed7f5d8e89 (patch)
tree9c40b6367afd28d90e9952af5d986912a5368b24 /drivers
parent307ecb6db04eebdc06b8c87d48bf48d3cbd5e9d7 (diff)
parent85f9823cd74bd2d9a7854ca0b2244e43b5214e5a (diff)
downloadblackbird-obmc-uboot-68ccfa482be0c7e4aa18285aceb214ed7f5d8e89.tar.gz
blackbird-obmc-uboot-68ccfa482be0c7e4aa18285aceb214ed7f5d8e89.zip
Merge branch 'master' into next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/ndfc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 528b22b49a..0891936f00 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -89,8 +89,8 @@ static int ndfc_calculate_ecc(struct mtd_info *mtdinfo,
/* The NDFC uses Smart Media (SMC) bytes order
*/
- ecc_code[0] = p[2];
- ecc_code[1] = p[1];
+ ecc_code[0] = p[1];
+ ecc_code[1] = p[2];
ecc_code[2] = p[3];
return 0;
OpenPOWER on IntegriCloud