diff options
| author | Thierry Escande <thierry.escande@collabora.com> | 2016-06-16 20:25:23 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-07-06 10:02:08 +0200 |
| commit | 9f0c4542c49cbd041f2b6943b16644af0a3ff48f (patch) | |
| tree | e9276c73f1638498861d5a2c47369b4a512a2cbd /drivers/nfc | |
| parent | NFC: port100: Make port100_abort_cmd() synchronous (diff) | |
| download | linux-9f0c4542c49cbd041f2b6943b16644af0a3ff48f.tar.xz linux-9f0c4542c49cbd041f2b6943b16644af0a3ff48f.zip | |
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>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/port100.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 481cb435e19f..2b2330b235e6 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)) |