diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
commit | 98817a84ff1c755c347ac633ff017a623a631fad (patch) | |
tree | 93bd22485a697d1dbba97b2829b82e03c08ae57f /drivers/nfc | |
parent | 0e698dfa282211e414076f9dc7e83c1c288314fd (diff) | |
parent | 005c34ae4b44f085120d7f371121ec7ded677761 (diff) | |
download | linux-98817a84ff1c755c347ac633ff017a623a631fad.tar.bz2 |
Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- Fix atomicity of affinity update in the GIC driver
- Don't sleep in atomic when waiting for a GICv4.1 RD to respond
- Fix a couple of typos in user-visible messages
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/fdp/Kconfig | 4 | ||||
-rw-r--r-- | drivers/nfc/microread/Kconfig | 6 | ||||
-rw-r--r-- | drivers/nfc/nxp-nci/Kconfig | 4 | ||||
-rw-r--r-- | drivers/nfc/pn533/Kconfig | 6 | ||||
-rw-r--r-- | drivers/nfc/pn544/Kconfig | 6 | ||||
-rw-r--r-- | drivers/nfc/s3fwrn5/Kconfig | 4 | ||||
-rw-r--r-- | drivers/nfc/s3fwrn5/firmware.c | 10 | ||||
-rw-r--r-- | drivers/nfc/st-nci/Kconfig | 6 | ||||
-rw-r--r-- | drivers/nfc/st21nfca/Kconfig | 4 | ||||
-rw-r--r-- | drivers/nfc/st21nfca/dep.c | 4 |
10 files changed, 24 insertions, 30 deletions
diff --git a/drivers/nfc/fdp/Kconfig b/drivers/nfc/fdp/Kconfig index f575d2aec553..6c51f4af4256 100644 --- a/drivers/nfc/fdp/Kconfig +++ b/drivers/nfc/fdp/Kconfig @@ -4,7 +4,7 @@ config NFC_FDP depends on NFC_NCI select CRC_CCITT default n - ---help--- + help Intel Fields Peak NFC controller core driver. This is a driver based on the NCI NFC kernel layers. @@ -15,7 +15,7 @@ config NFC_FDP config NFC_FDP_I2C tristate "NFC FDP i2c support" depends on NFC_FDP && I2C - ---help--- + help This module adds support for the Intel Fields Peak NFC controller i2c interface. Select this if your platform is using the i2c bus. diff --git a/drivers/nfc/microread/Kconfig b/drivers/nfc/microread/Kconfig index 07be6d48a644..21a682b19613 100644 --- a/drivers/nfc/microread/Kconfig +++ b/drivers/nfc/microread/Kconfig @@ -2,7 +2,7 @@ config NFC_MICROREAD tristate select CRC_CCITT - ---help--- + help This module contains the main code for Inside Secure microread NFC chipsets. It implements the chipset HCI logic and hooks into the NFC kernel APIs. Physical layers will register against it. @@ -11,7 +11,7 @@ config NFC_MICROREAD_I2C tristate "Inside Secure Microread device support (I2C)" depends on NFC_HCI && I2C && NFC_SHDLC select NFC_MICROREAD - ---help--- + help This module adds support for the i2c interface of adapters using Inside microread chipsets. Select this if your platform is using the i2c bus. @@ -23,7 +23,7 @@ config NFC_MICROREAD_MEI tristate "Inside Secure Microread device support (MEI)" depends on NFC_HCI && NFC_MEI_PHY select NFC_MICROREAD - ---help--- + help This module adds support for the mei interface of adapters using Inside microread chipsets. Select this if your microread chipset is handled by Intel's Management Engine Interface on your platform. diff --git a/drivers/nfc/nxp-nci/Kconfig b/drivers/nfc/nxp-nci/Kconfig index e1f71deab6fc..ab6db98b495d 100644 --- a/drivers/nfc/nxp-nci/Kconfig +++ b/drivers/nfc/nxp-nci/Kconfig @@ -2,7 +2,7 @@ config NFC_NXP_NCI tristate "NXP-NCI NFC driver" depends on NFC_NCI - ---help--- + help Generic core driver for NXP NCI chips such as the NPC100 (PN547), NPC300 (PN548) or PN7150 families. This is a driver based on the NCI NFC kernel layers and @@ -15,7 +15,7 @@ config NFC_NXP_NCI config NFC_NXP_NCI_I2C tristate "NXP-NCI I2C support" depends on NFC_NXP_NCI && I2C - ---help--- + help This module adds support for an I2C interface to the NXP NCI chips. Select this if your platform is using the I2C bus. diff --git a/drivers/nfc/pn533/Kconfig b/drivers/nfc/pn533/Kconfig index 7fe1bbe26568..31822b432d51 100644 --- a/drivers/nfc/pn533/Kconfig +++ b/drivers/nfc/pn533/Kconfig @@ -9,7 +9,7 @@ config NFC_PN533_USB tristate "NFC PN533 device support (USB)" depends on USB select NFC_PN533 - ---help--- + help This module adds support for the NXP pn533 USB interface. Select this if your platform is using the USB bus. @@ -20,7 +20,7 @@ config NFC_PN533_I2C tristate "NFC PN533 device support (I2C)" depends on I2C select NFC_PN533 - ---help--- + help This module adds support for the NXP pn533 I2C interface. Select this if your platform is using the I2C bus. @@ -31,7 +31,7 @@ config NFC_PN532_UART tristate "NFC PN532 device support (UART)" depends on SERIAL_DEV_BUS select NFC_PN533 - ---help--- + help This module adds support for the NXP pn532 UART interface. Select this if your platform is using the UART bus. diff --git a/drivers/nfc/pn544/Kconfig b/drivers/nfc/pn544/Kconfig index 47ef5e3f25ff..0fdc3108c528 100644 --- a/drivers/nfc/pn544/Kconfig +++ b/drivers/nfc/pn544/Kconfig @@ -2,7 +2,7 @@ config NFC_PN544 tristate select CRC_CCITT - ---help--- + help NXP PN544 core driver. This is a driver based on the HCI NFC kernel layers and will thus not work with NXP libnfc library. @@ -11,7 +11,7 @@ config NFC_PN544_I2C tristate "NXP PN544 device support (I2C)" depends on NFC_HCI && I2C && NFC_SHDLC select NFC_PN544 - ---help--- + help This module adds support for the NXP pn544 i2c interface. Select this if your platform is using the i2c bus. @@ -22,7 +22,7 @@ config NFC_PN544_MEI tristate "NXP PN544 device support (MEI)" depends on NFC_HCI && NFC_MEI_PHY select NFC_PN544 - ---help--- + help This module adds support for the mei interface of adapters using NXP pn544 chipsets. Select this if your pn544 chipset is handled by Intel's Management Engine Interface on your platform. diff --git a/drivers/nfc/s3fwrn5/Kconfig b/drivers/nfc/s3fwrn5/Kconfig index c4e86df392a4..af9d18690afe 100644 --- a/drivers/nfc/s3fwrn5/Kconfig +++ b/drivers/nfc/s3fwrn5/Kconfig @@ -2,7 +2,7 @@ config NFC_S3FWRN5 tristate select CRYPTO - ---help--- + help Core driver for Samsung S3FWRN5 NFC chip. Contains core utilities of chip. It's intended to be used by PHYs to avoid duplicating lots of common code. @@ -12,7 +12,7 @@ config NFC_S3FWRN5_I2C depends on NFC_NCI && I2C select NFC_S3FWRN5 default n - ---help--- + help This module adds support for an I2C interface to the S3FWRN5 chip. Select this if your platform is using the I2C bus. diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index de613c623a2c..69857f080704 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -434,15 +434,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) goto out; } - { - SHASH_DESC_ON_STACK(desc, tfm); - - desc->tfm = tfm; - - ret = crypto_shash_digest(desc, fw->image, image_size, - hash_data); - shash_desc_zero(desc); - } + ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data); crypto_free_shash(tfm); if (ret) { diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig index 8fe53da46280..0e6909206999 100644 --- a/drivers/nfc/st-nci/Kconfig +++ b/drivers/nfc/st-nci/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config NFC_ST_NCI tristate - ---help--- + help STMicroelectronics NFC NCI chips core driver. It implements the chipset NCI logic and hooks into the NFC kernel APIs. Physical layers will register against it. @@ -10,7 +10,7 @@ config NFC_ST_NCI_I2C tristate "STMicroelectronics ST NCI NFC driver (I2C)" depends on NFC_NCI && I2C select NFC_ST_NCI - ---help--- + help This module adds support for an I2C interface to the STMicroelectronics NFC NCI chips family. Select this if your platform is using the i2c bus. @@ -22,7 +22,7 @@ config NFC_ST_NCI_SPI tristate "STMicroelectronics ST NCI NFC driver (SPI)" depends on NFC_NCI && SPI select NFC_ST_NCI - ---help--- + help This module adds support for an SPI interface to the STMicroelectronics NFC NCI chips family. Select this if your platform is using the spi bus. diff --git a/drivers/nfc/st21nfca/Kconfig b/drivers/nfc/st21nfca/Kconfig index ab20724afe17..3407e9cfa140 100644 --- a/drivers/nfc/st21nfca/Kconfig +++ b/drivers/nfc/st21nfca/Kconfig @@ -2,7 +2,7 @@ config NFC_ST21NFCA tristate select CRC_CCITT - ---help--- + help STMicroelectronics ST21NFCA core driver. It implements the chipset HCI logic and hooks into the NFC kernel APIs. Physical layers will register against it. @@ -11,7 +11,7 @@ config NFC_ST21NFCA_I2C tristate "STMicroelectronics ST21NFCA NFC driver (I2C)" depends on NFC_HCI && I2C && NFC_SHDLC select NFC_ST21NFCA - ---help--- + help This module adds support for the STMicroelectronics st21nfca i2c interface. Select this if your platform is using the i2c bus. diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c index a1d69f9b2d4a..0b9ca6d20ffa 100644 --- a/drivers/nfc/st21nfca/dep.c +++ b/drivers/nfc/st21nfca/dep.c @@ -173,8 +173,10 @@ static int st21nfca_tm_send_atr_res(struct nfc_hci_dev *hdev, memcpy(atr_res->gbi, atr_req->gbi, gb_len); r = nfc_set_remote_general_bytes(hdev->ndev, atr_res->gbi, gb_len); - if (r < 0) + if (r < 0) { + kfree_skb(skb); return r; + } } info->dep_info.curr_nfc_dep_pni = 0; |