Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c31191 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by Samuel Ortiz
Browse files

NFC: Added error handling in event_received hci ops 



There is no use to return an error if the caller doesn't get it.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f0c91038

drivers/nfc/pn544/pn544.c

+13 −14
Original line number Diff line number Diff line
@@ -714,8 +714,8 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev, 
	return 0;

}



static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate,

					u8 event, struct sk_buff *skb)

static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event,

				    struct sk_buff *skb)

{

	struct sk_buff *rgb_skb = NULL;

	int r = 0;
@@ -724,25 +724,23 @@ static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, 
	switch (event) {

	case PN544_HCI_EVT_ACTIVATED:

		if (gate == PN544_RF_READER_NFCIP1_INITIATOR_GATE)

			nfc_hci_target_discovered(hdev, gate);

			r = nfc_hci_target_discovered(hdev, gate);

		else if (gate == PN544_RF_READER_NFCIP1_TARGET_GATE) {

			r = nfc_hci_get_param(hdev, gate, PN544_DEP_ATR_REQ,

					      &rgb_skb);



			if (r < 0)

				goto exit;



			nfc_tm_activated(hdev->ndev, NFC_PROTO_NFC_DEP_MASK,

			r = nfc_tm_activated(hdev->ndev, NFC_PROTO_NFC_DEP_MASK,

					     NFC_COMM_PASSIVE, rgb_skb->data,

					     rgb_skb->len);



			kfree_skb(rgb_skb);

		}



		break;

	case PN544_HCI_EVT_DEACTIVATED:

		nfc_hci_send_event(hdev, gate,

			NFC_HCI_EVT_END_OPERATION, NULL, 0);

		r = nfc_hci_send_event(hdev, gate, NFC_HCI_EVT_END_OPERATION,

				       NULL, 0);

		break;

	case PN544_HCI_EVT_RCV_DATA:

		if (skb->len < 2) {
@@ -757,15 +755,16 @@ static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, 
		}



		skb_pull(skb, 2);

		nfc_tm_data_received(hdev->ndev, skb);



		return;

		return nfc_tm_data_received(hdev->ndev, skb);

	default:

		pr_err("Discarded unknown event %x to gate %x\n", event, gate);

		break;

	}



exit:

	kfree_skb(skb);



	return r;

}



static struct nfc_hci_ops pn544_hci_ops = {

include/net/nfc/hci.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct nfc_hci_ops { 
	int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);

	int (*check_presence)(struct nfc_hci_dev *hdev,

			      struct nfc_target *target);

	void (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,

	int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,

			      struct sk_buff *skb);

};

net/nfc/hci/core.c

+5 −3
Original line number Diff line number Diff line
@@ -323,16 +323,18 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event, 
		break;

	default:

		if (hdev->ops->event_received) {

			hdev->ops->event_received(hdev, gate, event, skb);

			return;

			r = hdev->ops->event_received(hdev, gate, event, skb);

			goto exit_noskb;

		} else {

			r = -EINVAL;

		}



		break;

	}



exit:

	kfree_skb(skb);



exit_noskb:

	if (r) {

		/* TODO: There was an error dispatching the event,

		 * how to propagate up to nfc core?