From 4878361d2752942d3f34f4bc1587ca18f6e9a1d7 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Mon, 27 Feb 2012 14:10:47 +0000 Subject: [PATCH] drivers/acr122s: fix ACR122S initialization (Fixes Issue 185) --- libnfc/drivers/acr122s.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libnfc/drivers/acr122s.c b/libnfc/drivers/acr122s.c index 77e70b7..cdb5a04 100644 --- a/libnfc/drivers/acr122s.c +++ b/libnfc/drivers/acr122s.c @@ -251,9 +251,9 @@ static int acr122s_recv_frame(nfc_device *pnd, uint8_t *frame, size_t frame_size, void *abort_p, int timeout) { if (frame_size < 13) - pnd->last_error = NFC_EINVARG; + { pnd->last_error = NFC_EINVARG; return pnd->last_error; - + } int ret; serial_port port = DRIVER_DATA(pnd)->port; @@ -621,7 +621,7 @@ acr122s_open(const nfc_connstring connstring) } #endif - if (!pn53x_init(pnd)) { + if (pn53x_init(pnd) < 0) { log_put(LOG_CATEGORY, NFC_PRIORITY_ERROR, "%s", "Failed initializing PN532 chip."); acr122s_close(pnd); return NULL;