From ff22874bc1b06089dacea6cf747aefddf56bc2db Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Wed, 12 Nov 2008 16:06:40 +0200 Subject: [PATCH] --- yaml --- r: 128145 b: refs/heads/master c: 9359ea461b382de3249469d2165da45f4762b910 h: refs/heads/master i: 128143: e55e2e8fd98e7fc266f22c5b863887154c397f91 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nandsim.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3411bf29c72e..359f03217f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f8f3af20ac5a1e58b419a98dfe76522885b5355 +refs/heads/master: 9359ea461b382de3249469d2165da45f4762b910 diff --git a/trunk/drivers/mtd/nand/nandsim.c b/trunk/drivers/mtd/nand/nandsim.c index ae7c57781a68..fdf82cf24449 100644 --- a/trunk/drivers/mtd/nand/nandsim.c +++ b/trunk/drivers/mtd/nand/nandsim.c @@ -1736,13 +1736,17 @@ 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)) { - /* - * We are in situation when something else (not command) - * was expected but command was input. In this case ignore - * previous command(s)/state(s) and accept the last one. - */ - NS_WARN("write_byte: command (%#x) wasn't expected, expected state is %s, " - "ignore previous states\n", (uint)byte, get_state_name(ns->nxstate)); + /* 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 + * previous command(s)/state(s) and accept the last one. + */ + 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)); }