Merge "NFC: Fix force firmware download for SN1xx HW" (5df191b8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/nfc/nq-nci.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -746,11 +746,19 @@ static int nfcc_hw_check(struct i2c_client client, struct nqx_dev nqx_dev)
		nci_get_version_rsp[3];
		nqx_dev->nqx_info.info.rom_version =
		nci_get_version_rsp[4];
		if ((nci_get_version_rsp[3] == NFCC_SN100_A)
		\|\| (nci_get_version_rsp[3] == NFCC_SN100_B)) {
		nqx_dev->nqx_info.info.fw_minor =
		nci_get_version_rsp[6];
		nqx_dev->nqx_info.info.fw_major =
		nci_get_version_rsp[7];
		} else {
		nqx_dev->nqx_info.info.fw_minor =
		nci_get_version_rsp[10];
		nqx_dev->nqx_info.info.fw_major =
		nci_get_version_rsp[11];
		}
		}
		goto err_nfcc_reset_failed;
		}
		ret = is_data_available_for_read(nqx_dev);