From 260016443b91e1a6d07686ddb6545d5f4bb0bf6e Mon Sep 17 00:00:00 2001 From: Eric Lapuyade Date: Tue, 2 Oct 2012 17:27:36 +0200 Subject: [PATCH] --- yaml --- r: 340934 b: refs/heads/master c: 632c016ab8ba1f98262bd6242b38d73ee4ae652e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/nfc/pn544_hci.c | 2 +- trunk/net/nfc/core.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9ee4dcf4b672..60e066fab068 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da052850b911dfd0fcd5c8d6308917ebe2edbacf +refs/heads/master: 632c016ab8ba1f98262bd6242b38d73ee4ae652e diff --git a/trunk/drivers/nfc/pn544_hci.c b/trunk/drivers/nfc/pn544_hci.c index b66d4681a577..70858b5f81e4 100644 --- a/trunk/drivers/nfc/pn544_hci.c +++ b/trunk/drivers/nfc/pn544_hci.c @@ -986,7 +986,7 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev, } else if (target->supported_protocols & NFC_PROTO_MIFARE_MASK) { if (target->nfcid1_len != 4 && target->nfcid1_len != 7 && target->nfcid1_len != 10) - return -EPROTO; + return -EOPNOTSUPP; return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, PN544_RF_READER_CMD_ACTIVATE_NEXT, diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c index 479bee36dc3e..4cb069766ce5 100644 --- a/trunk/net/nfc/core.c +++ b/trunk/net/nfc/core.c @@ -697,6 +697,8 @@ static void nfc_check_pres_work(struct work_struct *work) if (dev->active_target && timer_pending(&dev->check_pres_timer) == 0) { rc = dev->ops->check_presence(dev, dev->active_target); + if (rc == -EOPNOTSUPP) + goto exit; if (!rc) { mod_timer(&dev->check_pres_timer, jiffies + msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS)); @@ -708,6 +710,7 @@ static void nfc_check_pres_work(struct work_struct *work) } } +exit: device_unlock(&dev->dev); }