diff options
| author | Julia Cartwright <julia@ni.com> | 2018-02-26 11:22:02 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-02-26 11:22:02 -0600 |
| commit | 184d107421c695782ae8cc976170e3cf83fbca9a (patch) | |
| tree | 20d804c113e6fbc3a298b069b5a777fb81e194f4 /drivers/mtd/nand/sunxi_nand.c | |
| parent | 90816cc1d4a1d23efe37b74866c6174dd5eab6b5 (diff) | |
| parent | 19c04ca5b239e6e2277a5b381d1e79482ab9bbc5 (diff) | |
| download | linux-rt-184d107421c695782ae8cc976170e3cf83fbca9a.tar.gz | |
Merge tag 'v4.9.84' into v4.9-rt
This is the 4.9.84 stable release
Diffstat (limited to 'drivers/mtd/nand/sunxi_nand.c')
| -rw-r--r-- | drivers/mtd/nand/sunxi_nand.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index f9b2a771096b..e26c4f880df6 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1835,8 +1835,14 @@ static int sunxi_nand_hw_common_ecc_ctrl_init(struct mtd_info *mtd, /* Add ECC info retrieval from DT */ for (i = 0; i < ARRAY_SIZE(strengths); i++) { - if (ecc->strength <= strengths[i]) + if (ecc->strength <= strengths[i]) { + /* + * Update ecc->strength value with the actual strength + * that will be used by the ECC engine. + */ + ecc->strength = strengths[i]; break; + } } if (i >= ARRAY_SIZE(strengths)) { |