diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 17:12:06 +0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-09-25 03:35:41 +0400 |
| commit | cec4b8edc9c139ef658e2a26aa38a2a4b768aec6 (patch) | |
| tree | 4ad69fc6a954dfe52a84105d630eb678a9949408 /drivers/nfc | |
| parent | 673088fb42d0d6de500c4d3e22527611982dcce1 (diff) | |
| download | linux-cec4b8edc9c139ef658e2a26aa38a2a4b768aec6.tar.xz | |
NFC: pn533: Start listen timer from start_poll
If we start the polling loop from a listening cycle, we need to start
the corresponding timer as well.
This bug showed up after commit dfccd0f5 as it was impossible to start
from a listening cycle before it.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/pn533.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 8cffd73690b8..dbe962c47a56 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -2027,7 +2027,9 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev, u32 im_protocols, u32 tm_protocols) { struct pn533 *dev = nfc_get_drvdata(nfc_dev); + struct pn533_poll_modulations *cur_mod; u8 rand_mod; + int rc; dev_dbg(&dev->interface->dev, "%s: im protocols 0x%x tm protocols 0x%x\n", @@ -2060,7 +2062,15 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev, rand_mod %= dev->poll_mod_count; dev->poll_mod_curr = rand_mod; - return pn533_send_poll_frame(dev); + cur_mod = dev->poll_mod_active[dev->poll_mod_curr]; + + rc = pn533_send_poll_frame(dev); + + /* Start listen timer */ + if (!rc && cur_mod->len == 0 && dev->poll_mod_count > 1) + mod_timer(&dev->listen_timer, jiffies + PN533_LISTEN_TIME * HZ); + + return rc; } static void pn533_stop_poll(struct nfc_dev *nfc_dev) |