From 9f0c4542c49cbd041f2b6943b16644af0a3ff48f Mon Sep 17 00:00:00 2001 From: Thierry Escande <thierry.escande@collabora.com> Date: Thu, 16 Jun 2016 20:25:23 +0200 Subject: [PATCH] NFC: port100: Abort current command before switching RF off If a command is still being processed by the device, the switch RF off command will be rejected. With this patch, the port100 driver calls port100_abort_cmd() before sending the switch RF off command. Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> --- drivers/nfc/port100.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 481cb435e19f3..2b2330b235e63 100644 --- a/drivers/nfc/port100.c +++ b/drivers/nfc/port100.c @@ -1050,6 +1050,10 @@ static int port100_switch_rf(struct nfc_digital_dev *ddev, bool on) *skb_put(skb, 1) = on ? 1 : 0; + /* Cancel the last command if the device is being switched off */ + if (!on) + port100_abort_cmd(ddev); + resp = port100_send_cmd_sync(dev, PORT100_CMD_SWITCH_RF, skb); if (IS_ERR(resp)) -- 2.30.2