From: Patrick van Gelder Date: Fri, 24 Apr 2020 07:28:56 +0000 (-0600) Subject: ARM: zynq: Fix invalid check on NAND_CMD_NONE. X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=27d706937a5c72f0414a540ca20fd36b4b72bda7;p=u-boot.git ARM: zynq: Fix invalid check on NAND_CMD_NONE. The end_cmd field in the variables cmd_phase_addr and data_phase_addr contains the value 0xFF when the end_cmd equals NAND_CMD_NONE. This should be 0x00. This is caused by comparing NAND_CMD_NONE (int) with end_cmd (u8). end_cmd will be promoted by the int value -1 and therefore is not equal to 0xFF. Solved by casting NAND_CMD_NONE to u8 which will avoid int promotion. Signed-off-by: Patrick van Gelder Reviewed-by: T Karthik Reddy Signed-off-by: Michal Simek --- diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index 0aea83dac0..3941297418 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -845,7 +845,7 @@ static void zynq_nand_cmd_function(struct mtd_info *mtd, unsigned int command, if (curr_cmd->end_cmd_valid == ZYNQ_NAND_CMD_PHASE) end_cmd_valid = 1; - if (curr_cmd->end_cmd == NAND_CMD_NONE) + if (curr_cmd->end_cmd == (u8)NAND_CMD_NONE) end_cmd = 0x0; else end_cmd = curr_cmd->end_cmd;