]> git.karo-electronics.de Git - linux-beck.git/commitdiff
NFC: pn533: Fix hardware busy loop when establishing the LLCP link
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 26 Jun 2013 15:53:09 +0000 (17:53 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 13 Aug 2013 22:35:17 +0000 (00:35 +0200)
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>
drivers/nfc/pn533.c

index daf92ac209f898d87ab2b3e08df379248da7e7a0..3c169e3fdee18c745345bc6d31270c2f2a06102d 100644 (file)
@@ -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;