Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christophe Ricard and committed by
Samuel Ortiz
de5ea851 18836029

+3 -1
+1
net/nfc/nci/core.c
··· 646 646 647 647 int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id) 648 648 { 649 + ndev->cur_conn_id = conn_id; 649 650 return __nci_request(ndev, nci_core_conn_close_req, conn_id, 650 651 msecs_to_jiffies(NCI_CMD_TIMEOUT)); 651 652 }
+2 -1
net/nfc/nci/rsp.c
··· 271 271 272 272 pr_debug("status 0x%x\n", status); 273 273 if (status == NCI_STATUS_OK) { 274 - conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_id); 274 + conn_info = nci_get_conn_info_by_conn_id(ndev, 275 + ndev->cur_conn_id); 275 276 if (conn_info) { 276 277 list_del(&conn_info->list); 277 278 devm_kfree(&ndev->nfc_dev->dev, conn_info);