Evolution-X-Devices/kernel_oneplus_sm8550-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'LA.VENDOR.13.2.0.r1-20500-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/vendor/nxp/opensource/driver into lineage-21

Browse Source 
LA.VENDOR.13.2.0.r1-20500-KAILUA.0

* tag 'LA.VENDOR.13.2.0.r1-20500-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/vendor/nxp/opensource/driver:
  NFC: avoid freeing unallocated memory
  nfc-driver: Enable sn220 nfc driver for crow

Change-Id: I991ffdcc09bf879694401099989c344674e5e3d4
This commit is contained in:
Bruno Martins
2023-11-15 12:44:12 +00:00
parent b1d3120dcb fd7edfaae4
commit b2e423d20f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nxp/opensource/driver/nfc/ese_cold_reset.c
View File

@@ -390,10 +390,14 @@ int ese_cold_reset_ioctl(struct nfc_dev *nfc_dev, unsigned long arg)
ret = nfc_dev->cold_reset.status;
err:
kfree(nfc_dev->cold_reset.cmd_buf);
nfc_dev->cold_reset.cmd_buf = NULL;
kfree(cold_reset_arg);
cold_reset_arg = NULL;
if (nfc_dev->cold_reset.cmd_buf != NULL) {
kfree(nfc_dev->cold_reset.cmd_buf);
nfc_dev->cold_reset.cmd_buf = NULL;
}
if (cold_reset_arg != NULL) {
kfree(cold_reset_arg);
cold_reset_arg = NULL;
}
mutex_unlock(&nfc_dev->write_mutex);

2
nxp/opensource/driver/nfc_kernel_dlkm_vendor_board.mk
View File

@@ -1,5 +1,5 @@
# Build NFC kernel driver
ifeq ($(call is-board-platform-in-list, kalama bengal),true)
ifeq ($(call is-board-platform-in-list, kalama bengal crow),true)
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko
endif