---

yaml --- r: 27886 b: refs/heads/master c: f5bbdac h: refs/heads/master v: v3
git-mirror · May 25, 2006 · fc3336f · fc3336f
1 parent b517821
commit fc3336f
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 256 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9577f44a899cf4acb9e381c8946307b72153cd15
+refs/heads/master: f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d
diff --git a/trunk/drivers/mtd/nand/diskonchip.c b/trunk/drivers/mtd/nand/diskonchip.c
@@ -968,12 +968,14 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat, unsign
 	return 0;
 }
 
-static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
+static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
+				u_char *read_ecc, u_char *isnull)
 {
 	int i, ret = 0;
 	struct nand_chip *this = mtd->priv;
 	struct doc_priv *doc = this->priv;
 	void __iomem *docptr = doc->virtadr;
+	uint8_t calc_ecc[6];
 	volatile u_char dummy;
 	int emptymatch = 1;