From: Christophe Ricard Date: Tue, 27 Jan 2015 00:18:16 +0000 (+0100) Subject: NFC: pn544: Change event_received gate parameter to pipe X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8abe3c6a9ec5e55daa6aec82215f3c27012e27fe;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 --- 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);