Commit 5876bc75 authored Mar 25, 2014 by Mark A. Greer Committed by Samuel Ortiz Apr 22, 2014

NFC: trf7970a: Only abort a command if one is active



Only initiate the abort command process when there is an active command.
If the abort process were started and there wasn't an active command
then the next command issued by the digital layer would be incorrectly
aborted.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 5fa3af35

drivers/nfc/trf7970a.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -1191,7 +1191,18 @@ static void trf7970a_abort_cmd(struct nfc_digital_dev *ddev)
		dev_dbg(trf->dev, "Abort process initiated\n");

		mutex_lock(&trf->lock);

		switch (trf->state) {
		case TRF7970A_ST_WAIT_FOR_TX_FIFO:
		case TRF7970A_ST_WAIT_FOR_RX_DATA:
		case TRF7970A_ST_WAIT_FOR_RX_DATA_CONT:
		case TRF7970A_ST_WAIT_TO_ISSUE_EOF:
		trf->aborting = true;
		break;
		default:
		break;
		}

		mutex_unlock(&trf->lock);
		}

Admin message