diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/nfc/pn533.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index f563cac02f31..18e279d3e836 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -1169,8 +1169,7 @@ static void pn533_poll_create_mod_list(struct pn533 *dev, | |||
1169 | pn533_poll_add_mod(dev, PN533_LISTEN_MOD); | 1169 | pn533_poll_add_mod(dev, PN533_LISTEN_MOD); |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | static int pn533_start_poll_complete(struct pn533 *dev, void *arg, | 1172 | static int pn533_start_poll_complete(struct pn533 *dev, u8 *params, int params_len) |
1173 | u8 *params, int params_len) | ||
1174 | { | 1173 | { |
1175 | struct pn533_poll_response *resp; | 1174 | struct pn533_poll_response *resp; |
1176 | int rc; | 1175 | int rc; |
@@ -1308,8 +1307,7 @@ static void pn533_wq_tg_get_data(struct work_struct *work) | |||
1308 | } | 1307 | } |
1309 | 1308 | ||
1310 | #define ATR_REQ_GB_OFFSET 17 | 1309 | #define ATR_REQ_GB_OFFSET 17 |
1311 | static int pn533_init_target_complete(struct pn533 *dev, void *arg, | 1310 | static int pn533_init_target_complete(struct pn533 *dev, u8 *params, int params_len) |
1312 | u8 *params, int params_len) | ||
1313 | { | 1311 | { |
1314 | struct pn533_cmd_init_target_response *resp; | 1312 | struct pn533_cmd_init_target_response *resp; |
1315 | u8 frame, comm_mode = NFC_COMM_PASSIVE, *gb; | 1313 | u8 frame, comm_mode = NFC_COMM_PASSIVE, *gb; |
@@ -1406,9 +1404,9 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg, | |||
1406 | if (cur_mod->len == 0) { | 1404 | if (cur_mod->len == 0) { |
1407 | del_timer(&dev->listen_timer); | 1405 | del_timer(&dev->listen_timer); |
1408 | 1406 | ||
1409 | return pn533_init_target_complete(dev, arg, params, params_len); | 1407 | return pn533_init_target_complete(dev, params, params_len); |
1410 | } else { | 1408 | } else { |
1411 | rc = pn533_start_poll_complete(dev, arg, params, params_len); | 1409 | rc = pn533_start_poll_complete(dev, params, params_len); |
1412 | if (!rc) | 1410 | if (!rc) |
1413 | return rc; | 1411 | return rc; |
1414 | } | 1412 | } |