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

Commit 276b8c77 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next 



Samuel Ortiz says:

====================
NFC 4.8 pull request

This is the first NFC pull request for 4.8. We have:

- A fairly large NFC digital stack patchset:
  * RTOX fixes.
  * Proper DEP RWT support.
  * ACK and NACK PDUs handling fixes, in both initiator
    and target modes.
  * A few memory leak fixes.

- A conversion of the nfcsim driver to use the digital stack.
  The driver supports the DEP protocol in both NFC-A and NFC-F.

- Error injection through debugfs for the nfcsim driver.

- Improvements to the port100 driver for the Sony USB chipset, in
  particular to the command abort and cancellation code paths.

- A few minor fixes for the pn533, trf7970a and fdp drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0f06a678 2a0fe4fe

drivers/nfc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config NFC_MEI_PHY 


config NFC_SIM

	tristate "NFC hardware simulator driver"

	depends on NFC_DIGITAL

	help

	  This driver declares two virtual NFC devices supporting NFC-DEP

	  protocol. An LLCP connection can be established between them and

drivers/nfc/fdp/fdp.c

+3 −3
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void fdp_nci_release_firmware(struct nci_dev *ndev) 


	if (info->ram_patch) {

		release_firmware(info->ram_patch);

		info->otp_patch = NULL;

		info->ram_patch = NULL;

	}

}
@@ -353,7 +353,7 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev) 
{

	struct fdp_nci_info *info = nci_get_drvdata(ndev);

	struct device *dev = &info->phy->i2c_dev->dev;

	u8 conn_id;

	int conn_id;

	int r = 0;



	if (info->otp_version >= info->otp_patch_version)
@@ -424,7 +424,7 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev) 
{

	struct fdp_nci_info *info = nci_get_drvdata(ndev);

	struct device *dev = &info->phy->i2c_dev->dev;

	u8 conn_id;

	int conn_id;

	int r = 0;



	if (info->ram_version >= info->ram_patch_version)

drivers/nfc/nfcsim.c

+305 −338

File changed.

Preview size limit exceeded, changes collapsed.

drivers/nfc/pn533/usb.c

+3 −6
Original line number Diff line number Diff line
@@ -464,10 +464,8 @@ static int pn533_usb_probe(struct usb_interface *interface, 
		return -ENOMEM;



	in_buf = kzalloc(in_buf_len, GFP_KERNEL);

	if (!in_buf) {

		rc = -ENOMEM;

		goto out_free_phy;

	}

	if (!in_buf)

		return -ENOMEM;



	phy->udev = usb_get_dev(interface_to_usbdev(interface));

	phy->interface = interface;
@@ -554,8 +552,7 @@ static int pn533_usb_probe(struct usb_interface *interface, 
	usb_free_urb(phy->out_urb);

	usb_put_dev(phy->udev);

	kfree(in_buf);

out_free_phy:

	kfree(phy);



	return rc;

}

drivers/nfc/port100.c

+76 −6

File changed.

Preview size limit exceeded, changes collapsed.