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

Commit 161ae887 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-wireless' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0

parents eac9ac6d 03e934f6

net/nfc/nci/ntf.c

+5 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev, 
	nfca_poll->sens_res = __le16_to_cpu(*((__u16 *)data));

	data += 2;



	nfca_poll->nfcid1_len = *data++;

	nfca_poll->nfcid1_len = min_t(__u8, *data++, NFC_NFCID1_MAXSIZE);



	pr_debug("sens_res 0x%x, nfcid1_len %d\n",

		 nfca_poll->sens_res, nfca_poll->nfcid1_len);
@@ -130,7 +130,7 @@ static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev, 
			struct rf_tech_specific_params_nfcb_poll *nfcb_poll,

						     __u8 *data)

{

	nfcb_poll->sensb_res_len = *data++;

	nfcb_poll->sensb_res_len = min_t(__u8, *data++, NFC_SENSB_RES_MAXSIZE);



	pr_debug("sensb_res_len %d\n", nfcb_poll->sensb_res_len);
@@ -145,7 +145,7 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev, 
						     __u8 *data)

{

	nfcf_poll->bit_rate = *data++;

	nfcf_poll->sensf_res_len = *data++;

	nfcf_poll->sensf_res_len = min_t(__u8, *data++, NFC_SENSF_RES_MAXSIZE);



	pr_debug("bit_rate %d, sensf_res_len %d\n",

		 nfcf_poll->bit_rate, nfcf_poll->sensf_res_len);
@@ -331,7 +331,7 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev, 
	switch (ntf->activation_rf_tech_and_mode) {

	case NCI_NFC_A_PASSIVE_POLL_MODE:

		nfca_poll = &ntf->activation_params.nfca_poll_iso_dep;

		nfca_poll->rats_res_len = *data++;

		nfca_poll->rats_res_len = min_t(__u8, *data++, 20);

		pr_debug("rats_res_len %d\n", nfca_poll->rats_res_len);

		if (nfca_poll->rats_res_len > 0) {

			memcpy(nfca_poll->rats_res,
@@ -341,7 +341,7 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev, 


	case NCI_NFC_B_PASSIVE_POLL_MODE:

		nfcb_poll = &ntf->activation_params.nfcb_poll_iso_dep;

		nfcb_poll->attrib_res_len = *data++;

		nfcb_poll->attrib_res_len = min_t(__u8, *data++, 50);

		pr_debug("attrib_res_len %d\n", nfcb_poll->attrib_res_len);

		if (nfcb_poll->attrib_res_len > 0) {

			memcpy(nfcb_poll->attrib_res,

net/nfc/rawsock.c

+4 −1
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ static int rawsock_release(struct socket *sock) 
{

	struct sock *sk = sock->sk;



	pr_debug("sock=%p\n", sock);

	pr_debug("sock=%p sk=%p\n", sock, sk);



	if (!sk)

		return 0;



	sock_orphan(sk);

	sock_put(sk);