summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-01-27 01:18:16 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-01-28 00:03:35 +0100
commit8abe3c6a9ec5e55daa6aec82215f3c27012e27fe (patch)
treea364599a94669794311e96017366a1c316772c96
parent8409e4283c1ca62ce107564de7ff93b4dd476d41 (diff)
downloadlinux-8abe3c6a9ec5e55daa6aec82215f3c27012e27fe.tar.gz
linux-8abe3c6a9ec5e55daa6aec82215f3c27012e27fe.tar.bz2
linux-8abe3c6a9ec5e55daa6aec82215f3c27012e27fe.zip
NFC: pn544: Change event_received gate parameter to pipe
The below event_received hci handler has change the gate parameter to pipe. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
-rw-r--r--drivers/nfc/pn544/pn544.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index 9c8051d20cea..12e819ddf17a 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -724,10 +724,11 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
* <= 0: driver handled the event, skb consumed
* 1: driver does not handle the event, please do standard processing
*/
-static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
struct sk_buff *skb)
{
struct sk_buff *rgb_skb = NULL;
+ u8 gate = hdev->pipes[pipe].gate;
int r;
pr_debug("hci event %d\n", event);