diff --git a/nxp/opensource/driver/nfc/ese_cold_reset.c b/nxp/opensource/driver/nfc/ese_cold_reset.c
index 086b566c6c..eaab37a43b 100644
--- a/nxp/opensource/driver/nfc/ese_cold_reset.c
+++ b/nxp/opensource/driver/nfc/ese_cold_reset.c
@@ -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);
 
diff --git a/nxp/opensource/driver/nfc_kernel_dlkm_vendor_board.mk b/nxp/opensource/driver/nfc_kernel_dlkm_vendor_board.mk
index f75f447281..8369464647 100644
--- a/nxp/opensource/driver/nfc_kernel_dlkm_vendor_board.mk
+++ b/nxp/opensource/driver/nfc_kernel_dlkm_vendor_board.mk
@@ -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