git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
mtd
/
mtdconcat.c
diff --git
a/drivers/mtd/mtdconcat.c
b/drivers/mtd/mtdconcat.c
index
e601672
..
6df4d4d
100644
(file)
--- a/
drivers/mtd/mtdconcat.c
+++ b/
drivers/mtd/mtdconcat.c
@@
-95,10
+95,10
@@
concat_read(struct mtd_info *mtd, loff_t from, size_t len,
/* Save information about bitflips! */
if (unlikely(err)) {
/* Save information about bitflips! */
if (unlikely(err)) {
- if (
err == -EBADMSG
) {
+ if (
mtd_is_eccerr(err)
) {
mtd->ecc_stats.failed++;
ret = err;
mtd->ecc_stats.failed++;
ret = err;
- } else if (
err == -EUCLEAN
) {
+ } else if (
mtd_is_bitflip(err)
) {
mtd->ecc_stats.corrected++;
/* Do not overwrite -EBADMSG !! */
if (!ret)
mtd->ecc_stats.corrected++;
/* Do not overwrite -EBADMSG !! */
if (!ret)
@@
-279,10
+279,10
@@
concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)
/* Save information about bitflips! */
if (unlikely(err)) {
/* Save information about bitflips! */
if (unlikely(err)) {
- if (
err == -EBADMSG
) {
+ if (
mtd_is_eccerr(err)
) {
mtd->ecc_stats.failed++;
ret = err;
mtd->ecc_stats.failed++;
ret = err;
- } else if (
err == -EUCLEAN
) {
+ } else if (
mtd_is_bitflip(err)
) {
mtd->ecc_stats.corrected++;
/* Do not overwrite -EBADMSG !! */
if (!ret)
mtd->ecc_stats.corrected++;
/* Do not overwrite -EBADMSG !! */
if (!ret)
@@
-770,7
+770,7
@@
struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
/*
* Set up the new "super" device's MTD object structure, check for
/*
* Set up the new "super" device's MTD object structure, check for
- * incompatibilites between the subdevices.
+ * incompatibilit
i
es between the subdevices.
*/
concat->mtd.type = subdev[0]->type;
concat->mtd.flags = subdev[0]->flags;
*/
concat->mtd.type = subdev[0]->type;
concat->mtd.flags = subdev[0]->flags;