]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
nand: pl35x: Fix unreachable code
authorFabian Vogt <fabian@ritter-vogt.de>
Mon, 16 Nov 2015 18:00:18 +0000 (19:00 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 17 Nov 2015 10:15:54 +0000 (11:15 +0100)
Bug: (x == 1) && (x == 2) is always false.

Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/mtd/nand/pl35x_nand.c

index 406f1f0fa1d1f6e3485137aaba63858ba394b48a..a7eb32bbc2a2c18bd84c6bb8e5d9e05f58fd5dbf 100644 (file)
@@ -726,7 +726,7 @@ static void pl35x_nand_cmd_function(struct mtd_info *mtd, unsigned int command,
        else
                end_cmd = curr_cmd->end_cmd;
 
-       if ((command == NAND_CMD_READ0) && (command == NAND_CMD_SEQIN))
+       if (command == NAND_CMD_READ0 || command == NAND_CMD_SEQIN)
                addrcycles = xnand->row_addr_cycles + xnand->col_addr_cycles;
        else if (command == NAND_CMD_ERASE1)
                addrcycles = xnand->row_addr_cycles;