Commit b4bb4800 authored Aug 05, 2023 by Manivannan Sadhasivam Committed by Miquel Raynal Aug 18, 2023

mtd: rawnand: qcom: Fix the opcode check in qcom_check_op()

qcom_check_op() function checks for the invalid opcode for the instruction
types. Currently, it just returns -ENOTSUPP for all opcodes of
NAND_OP_CMD_INSTR type due to the use of "||" operator instead of "&&".
Fix it!

This also fixes the following smatch warning:

drivers/mtd/nand/raw/qcom_nandc.c:3036 qcom_check_op() warn: was && intended here instead of ||?

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202308032022.SnXkKyFs-lkp@intel.com/

Fixes: 89550beb ("mtd: rawnand: qcom: Implement exec_op()")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230805174146.57006-5-manivannan.sadhasivam@linaro.org

parent dd3c8f4a

drivers/mtd/nand/raw/qcom_nandc.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3033,12 +3033,12 @@ static int qcom_check_op(struct nand_chip *chip,

		switch (instr->type) {
		case NAND_OP_CMD_INSTR:
		if (instr->ctx.cmd.opcode != NAND_CMD_RESET \|\|
		instr->ctx.cmd.opcode != NAND_CMD_READID \|\|
		instr->ctx.cmd.opcode != NAND_CMD_PARAM \|\|
		instr->ctx.cmd.opcode != NAND_CMD_ERASE1 \|\|
		instr->ctx.cmd.opcode != NAND_CMD_ERASE2 \|\|
		instr->ctx.cmd.opcode != NAND_CMD_STATUS \|\|
		if (instr->ctx.cmd.opcode != NAND_CMD_RESET &&
		instr->ctx.cmd.opcode != NAND_CMD_READID &&
		instr->ctx.cmd.opcode != NAND_CMD_PARAM &&
		instr->ctx.cmd.opcode != NAND_CMD_ERASE1 &&
		instr->ctx.cmd.opcode != NAND_CMD_ERASE2 &&
		instr->ctx.cmd.opcode != NAND_CMD_STATUS &&
		instr->ctx.cmd.opcode != NAND_CMD_PAGEPROG)
		return -ENOTSUPP;
		break;