diff options
author | Mark Brown | 2019-05-20 12:54:21 +0200 |
---|---|---|
committer | Mark Brown | 2019-05-20 12:54:21 +0200 |
commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/mtd/nand/raw/mtk_nand.c | |
parent | spi: tegra114: add support for TX and RX trimmers (diff) | |
parent | Linux 5.2-rc1 (diff) | |
download | kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/mtd/nand/raw/mtk_nand.c')
-rw-r--r-- | drivers/mtd/nand/raw/mtk_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c index 2c0e09187773..b17619f30b1b 100644 --- a/drivers/mtd/nand/raw/mtk_nand.c +++ b/drivers/mtd/nand/raw/mtk_nand.c @@ -1197,8 +1197,8 @@ static int mtk_nfc_ecc_init(struct device *dev, struct mtd_info *mtd) /* if optional dt settings not present */ if (!nand->ecc.size || !nand->ecc.strength) { /* use datasheet requirements */ - nand->ecc.strength = nand->ecc_strength_ds; - nand->ecc.size = nand->ecc_step_ds; + nand->ecc.strength = nand->base.eccreq.strength; + nand->ecc.size = nand->base.eccreq.step_size; /* * align eccstrength and eccsize |