commit c0acf85ef7de677fa00e1f89d2d90e587720b89a
author Richard Weinberger <richard@nod.at> Mon Jun 18 17:56:38 2012 +0200
committer Richard Weinberger <richard@nod.at> Mon Jun 18 17:56:38 2012 +0200
tree 3e5d2e36fdc6d5bb4f49c2ead9ce607078d9c0c6
parent 07d6a64d3721cfa9b95492a0bd93ec93c8f8b127
parent 8595d7a59c969e2231aba19389cc11fc1f9afce7

Merge branch 'releases/v11' of ssh://cvs.ou.linutronix.de/people/rw/ubi-cp into fastmap/v11

drivers/mtd/ubi/fastmap.c

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 45f70db..cccb0c9 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -1000,11 +1000,12 @@
 	kfree(fmsb);
 
 	fmsb = (struct ubi_fm_sb *)fm_raw;
-	tmp_crc = fmsb->data_crc;
+	tmp_crc = be32_to_cpu(fmsb->data_crc);
 	fmsb->data_crc = 0;
-	crc = crc32_be(UBI_CRC32_INIT, fm_raw, fm_size);
+	crc = crc32(UBI_CRC32_INIT, fm_raw, fm_size);
 	if (crc != tmp_crc) {
 		ubi_err("fastmap data CRC is invalid");
+		ubi_err("CRC should be: 0x%x, calc: 0x%x", tmp_crc, crc);
 		ret = UBI_BAD_FASTMAP;
 		kfree(fm);
 		goto free_hdr;
@@ -1248,7 +1249,7 @@
 	}
 
 	fmsb->data_crc = 0;
-	fmsb->data_crc = crc32_be(UBI_CRC32_INIT, fm_raw, new_fm->size);
+	fmsb->data_crc = cpu_to_be32(crc32(UBI_CRC32_INIT, fm_raw, new_fm->size));
 
 	for (i = 1; i < new_fm->used_blocks; i++) {
 		dvhdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));