diff options
| author | Thierry Escande <thierry.escande@collabora.com> | 2016-06-16 20:25:20 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-07-06 10:02:07 +0200 |
| commit | e3e0258839a01f793a8a0c0885e8ad387681cdc6 (patch) | |
| tree | c4f6ae156e587151679ee6cab49da4a8d0c09f3b /drivers/nfc | |
| parent | NFC: llcp: Fix 2 memory leaks (diff) | |
| download | linux-e3e0258839a01f793a8a0c0885e8ad387681cdc6.tar.xz linux-e3e0258839a01f793a8a0c0885e8ad387681cdc6.zip | |
NFC: port100: Don't send a new command if one is still pending
This patch ensures that a command is not still in process before sending
a new one to the device. This can happen when neard is in constant
polling mode: the configure_hw command can be sent when neard restarts
polling after a LLCP SYMM timeout but before the device has returned in
timeout from the last DEP frame sent.
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 2d4bbe3fad57..14a3cc2d0fd6 100644 --- a/drivers/nfc/port100.c +++ b/drivers/nfc/port100.c @@ -809,6 +809,12 @@ static int port100_send_cmd_async(struct port100 *dev, u8 cmd_code, PORT100_FRAME_MAX_PAYLOAD_LEN + PORT100_FRAME_TAIL_LEN; + if (dev->cmd) { + nfc_err(&dev->interface->dev, + "A command is still in process\n"); + return -EBUSY; + } + resp = alloc_skb(resp_len, GFP_KERNEL); if (!resp) return -ENOMEM; |