diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-26 17:53:09 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-14 00:35:17 +0200 |
| commit | f1abed171fa565448d229afb814f66ab6d104d44 (patch) | |
| tree | c9a87f695cf41bd86d0acfb6934d9c57d5f9f510 /drivers/nfc | |
| parent | 91a32269e31282405db405b9ec9ce1a30568e4b0 (diff) | |
| download | linux-f1abed171fa565448d229afb814f66ab6d104d44.tar.gz linux-f1abed171fa565448d229afb814f66ab6d104d44.tar.bz2 linux-f1abed171fa565448d229afb814f66ab6d104d44.zip | |
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) switch (dev->device_type) { case PN533_DEVICE_STD: - max_retries.mx_rty_atr = PN533_CONFIG_MAX_RETRIES_ENDLESS; - max_retries.mx_rty_psl = 2; - max_retries.mx_rty_passive_act = - PN533_CONFIG_MAX_RETRIES_NO_RETRY; - - timing.rfu = PN533_CONFIG_TIMING_102; - timing.atr_res_timeout = PN533_CONFIG_TIMING_204; - timing.dep_timeout = PN533_CONFIG_TIMING_409; - - break; - case PN533_DEVICE_PASORI: case PN533_DEVICE_ACR122U: max_retries.mx_rty_atr = 0x2; |