On Mon, 24 Jun 2019 22:46:29 -0600
Naga Sureshkumar Relli <naga.sureshkumar.re...@xilinx.com> wrote:

> Add check before assigning chip->ecc.read_page() and chip->ecc.write_page()
> 
> Signed-off-by: Naga Sureshkumar Relli <naga.sureshkumar.re...@xilinx.com>
> ---
>  drivers/mtd/nand/raw/nand_micron.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/nand_micron.c 
> b/drivers/mtd/nand/raw/nand_micron.c
> index cbd4f09ac178..565f2696c747 100644
> --- a/drivers/mtd/nand/raw/nand_micron.c
> +++ b/drivers/mtd/nand/raw/nand_micron.c
> @@ -500,8 +500,11 @@ static int micron_nand_init(struct nand_chip *chip)
>               chip->ecc.size = 512;
>               chip->ecc.strength = chip->base.eccreq.strength;
>               chip->ecc.algo = NAND_ECC_BCH;
> -             chip->ecc.read_page = micron_nand_read_page_on_die_ecc;
> -             chip->ecc.write_page = micron_nand_write_page_on_die_ecc;
> +             if (!chip->ecc.read_page)
> +                     chip->ecc.read_page = micron_nand_read_page_on_die_ecc;
> +
> +             if (!chip->ecc.write_page)
> +                     chip->ecc.write_page = 
> micron_nand_write_page_on_die_ecc;

That's wrong, if you don't want on-die ECC to be used, simply don't set
nand-ecc-mode to "on-die".

>  
>               if (ondie == MICRON_ON_DIE_MANDATORY) {
>                       chip->ecc.read_page_raw = nand_read_page_raw_notsupp;

Reply via email to