Merge tag 'nand/for-6.10' into mtd/next
Raw NAND: Two small fixes, one in the Hynix vendor code for properly returning an error which might have been ignored and another in the Davinci driver to properly synchronize the controller with the gpio domain. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
@@ -671,8 +671,11 @@ static int davinci_nand_exec_instr(struct davinci_nand_info *info,
|
||||
break;
|
||||
}
|
||||
|
||||
if (instr->delay_ns)
|
||||
if (instr->delay_ns) {
|
||||
/* Dummy read to be sure that command is sent before ndelay starts */
|
||||
davinci_nand_readl(info, 0);
|
||||
ndelay(instr->delay_ns);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -401,7 +401,7 @@ static int hynix_nand_rr_init(struct nand_chip *chip)
|
||||
if (ret)
|
||||
pr_warn("failed to initialize read-retry infrastructure");
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void hynix_nand_extract_oobsize(struct nand_chip *chip,
|
||||
|
||||
Reference in New Issue
Block a user