diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-26 11:53:09 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-13 18:35:17 -0400 |
commit | f1abed171fa565448d229afb814f66ab6d104d44 (patch) | |
tree | c9a87f695cf41bd86d0acfb6934d9c57d5f9f510 /drivers/nfc | |
parent | 91a32269e31282405db405b9ec9ce1a30568e4b0 (diff) |
NFC: pn533: Fix hardware busy loop when establishing the LLCP link
By using the standard setting for the regular pn533 dongles, we no
longer wait for ever for an ATR_RES. Without this, a failing ATR_REQ
will put the hardware into a busy loop, constantly waiting for an
ATR_RES.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/pn533.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index daf92ac209f8..3c169e3fdee1 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -2605,17 +2605,6 @@ static int pn533_setup(struct pn533 *dev) | |||
2605 | 2605 | ||
2606 | switch (dev->device_type) { | 2606 | switch (dev->device_type) { |
2607 | case PN533_DEVICE_STD: | 2607 | case PN533_DEVICE_STD: |
2608 | max_retries.mx_rty_atr = PN533_CONFIG_MAX_RETRIES_ENDLESS; | ||
2609 | max_retries.mx_rty_psl = 2; | ||
2610 | max_retries.mx_rty_passive_act = | ||
2611 | PN533_CONFIG_MAX_RETRIES_NO_RETRY; | ||
2612 | |||
2613 | timing.rfu = PN533_CONFIG_TIMING_102; | ||
2614 | timing.atr_res_timeout = PN533_CONFIG_TIMING_204; | ||
2615 | timing.dep_timeout = PN533_CONFIG_TIMING_409; | ||
2616 | |||
2617 | break; | ||
2618 | |||
2619 | case PN533_DEVICE_PASORI: | 2608 | case PN533_DEVICE_PASORI: |
2620 | case PN533_DEVICE_ACR122U: | 2609 | case PN533_DEVICE_ACR122U: |
2621 | max_retries.mx_rty_atr = 0x2; | 2610 | max_retries.mx_rty_atr = 0x2; |