mtd: docg4: ecc.read_page() returns 0 on uncorrectable errors

mike-dunn · David Woodhouse · commit 5bf3d66a933e · 2012-09-29T15:54:11.000+01:00
Currently the docg4's ecc.read_page() method returns -EBADMSG when
uncorrectable bitflips occur.  This is wrong; 0 should be returned in
this case.  An error code should only be returned by this method in the
case of a hardware error (probably -EIO).

Signed-off-by: Mike Dunn &lt;mikedunn@newsguy.com&gt;
Acked-by: Brian Norris &lt;computersforpeace@gmail.com&gt;
Signed-off-by: Artem Bityutskiy &lt;artem.bityutskiy@linux.intel.com&gt;
Signed-off-by: David Woodhouse &lt;David.Woodhouse@intel.com&gt;
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
@@ -776,6 +776,8 @@ static int read_page(struct mtd_info *mtd, struct nand_chip *nand,
 	}
 
 	writew(0, docptr + DOC_DATAEND);
+	if (bits_corrected == -EBADMSG)	  /* uncorrectable errors */
+		return 0;
 	return bits_corrected;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -776,6 +776,8 @@ static int read_page(struct mtd_info mtd, struct nand_chip nand,`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`writew(0, docptr + DOC_DATAEND);`
	`779`	`+ if (bits_corrected == -EBADMSG) /* uncorrectable errors */`
	`780`	`+ return 0;`
`779`	`781`	`return bits_corrected;`
`780`	`782`	`}`
`781`	`783`