projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
mtd
/
nand
/
omap2.c
diff --git
a/drivers/mtd/nand/omap2.c
b/drivers/mtd/nand/omap2.c
index 81b80af55872a4f2481dd6d3d0c61b762e02ff51..e9b1797cdb5f06ac4e0d38c3fd4486dbfbc3d13a 100644
(file)
--- a/
drivers/mtd/nand/omap2.c
+++ b/
drivers/mtd/nand/omap2.c
@@
-948,7
+948,7
@@
static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
u32 val;
val = readl(info->reg.gpmc_ecc_config);
u32 val;
val = readl(info->reg.gpmc_ecc_config);
- if (((val >> ECC_CONFIG_CS_SHIFT)
& ~
CS_MASK) != info->gpmc_cs)
+ if (((val >> ECC_CONFIG_CS_SHIFT)
&
CS_MASK) != info->gpmc_cs)
return -EINVAL;
/* read ecc result */
return -EINVAL;
/* read ecc result */
@@
-1463,7
+1463,7
@@
static int omap_elm_correct_data(struct mtd_info *mtd, u_char *data,
/* Check if any error reported */
if (!is_error_reported)
/* Check if any error reported */
if (!is_error_reported)
- return
0
;
+ return
stat
;
/* Decode BCH error using ELM module */
elm_decode_bch_error_page(info->elm_dev, ecc_vec, err_vec);
/* Decode BCH error using ELM module */
elm_decode_bch_error_page(info->elm_dev, ecc_vec, err_vec);