Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9359ea46 authored by Adrian Hunter's avatar Adrian Hunter Committed by David Woodhouse
Browse files

MTD: nandsim: suppress unnecessary warning 



nand_base sometimes reads only 2 bytes of a 4 byte id.
It is OK.  Do not print a warning in that case.

Signed-off-by: default avatarAdrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4f8f3af2

drivers/mtd/nand/nandsim.c

+11 −7
Original line number Diff line number Diff line
@@ -1736,6 +1736,9 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte) 


		/* Check if chip is expecting command */

		if (NS_STATE(ns->nxstate) != STATE_UNKNOWN && !(ns->nxstate & STATE_CMD_MASK)) {

			/* Do not warn if only 2 id bytes are read */

			if (!(ns->regs.command == NAND_CMD_READID &&

			    NS_STATE(ns->state) == STATE_DATAOUT_ID && ns->regs.count == 2)) {

				/*

				 * We are in situation when something else (not command)

				 * was expected but command was input. In this case ignore
@@ -1743,6 +1746,7 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte) 
				 */

				NS_WARN("write_byte: command (%#x) wasn't expected, expected state is %s, "

					"ignore previous states\n", (uint)byte, get_state_name(ns->nxstate));

			}

			switch_to_ready_state(ns, NS_STATUS_FAILED(ns));

		}