summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2016-04-30 09:12:50 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2016-05-04 01:42:31 +0200
commitde5ea8517c2ae40785fe5d0a2d02fc71bef1761b (patch)
tree5f555db8a94361cb44bc2dee4c244ec282513a3b /net/nfc
parent18836029d8c074ac1846167ba702ac528e0a0ad7 (diff)
downloadlinux-stable-de5ea8517c2ae40785fe5d0a2d02fc71bef1761b.tar.gz
linux-stable-de5ea8517c2ae40785fe5d0a2d02fc71bef1761b.tar.bz2
linux-stable-de5ea8517c2ae40785fe5d0a2d02fc71bef1761b.zip
nfc: nci: Fix nci_core_conn_close
nci_core_conn_close was not retrieving a conn_info using the correct connection id. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/core.c1
-rw-r--r--net/nfc/nci/rsp.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 031ac0f9538c..0884f1444817 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -646,6 +646,7 @@ static void nci_core_conn_close_req(struct nci_dev *ndev, unsigned long opt)
int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id)
{
+ ndev->cur_conn_id = conn_id;
return __nci_request(ndev, nci_core_conn_close_req, conn_id,
msecs_to_jiffies(NCI_CMD_TIMEOUT));
}
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 9b6eb913d801..69fe163b7350 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -271,7 +271,8 @@ static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev,
pr_debug("status 0x%x\n", status);
if (status == NCI_STATUS_OK) {
- conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_id);
+ conn_info = nci_get_conn_info_by_conn_id(ndev,
+ ndev->cur_conn_id);
if (conn_info) {
list_del(&conn_info->list);
devm_kfree(&ndev->nfc_dev->dev, conn_info);