summaryrefslogtreecommitdiffstats
path: root/net/nfc/hci
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-01-27 01:18:11 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-01-27 23:39:23 +0100
commitfda7a49cb991e9da15f5955d1ea292f8ec74f27a (patch)
tree052d7297b46ce087ffe3f07f4237cc5c32f262df /net/nfc/hci
parentNFC: st21nfcb: Fix copy/paste error in comment (diff)
downloadlinux-fda7a49cb991e9da15f5955d1ea292f8ec74f27a.tar.xz
linux-fda7a49cb991e9da15f5955d1ea292f8ec74f27a.zip
NFC: hci: Change event_received handler gate parameter to pipe
Several pipes may point to the same CLF gate, so getting the gate ID as an input is not enough. For example dual secure element may have 2 pipes (1 for uicc and 1 for eSE) pointing to the connectivity gate. As resolving gate and host IDs can be done from a pipe, we now pass the pipe ID to the event received handler. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci')
-rw-r--r--net/nfc/hci/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index ef50e7716c4a..12a9a4b956d2 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -338,7 +338,7 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
}
if (hdev->ops->event_received) {
- r = hdev->ops->event_received(hdev, gate, event, skb);
+ r = hdev->ops->event_received(hdev, pipe, event, skb);
if (r <= 0)
goto exit_noskb;
}