Merge "NFC: Fix device node probing issue" (f1b179c5) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/nfc/nq-nci.c

+15 −5

Original line number	Diff line number	Diff line
		@@ -841,6 +841,9 @@ static int nfcc_hw_check(struct i2c_client client, struct nqx_dev nqx_dev)

		reset_enable_gpio:
		/* making sure that the NFCC starts in a clean state. */
		gpio_set_value(enable_gpio, 1);/* HPD : Enable*/
		/* hardware dependent delay */
		usleep_range(10000, 10100);
		gpio_set_value(enable_gpio, 0);/* ULPM: Disable */
		/* hardware dependent delay */
		usleep_range(10000, 10100);
		@@ -906,8 +909,12 @@ static int nfcc_hw_check(struct i2c_client client, struct nqx_dev nqx_dev)
		}
		goto err_nfcc_reset_failed;
		}
		/* hardware dependent delay */
		msleep(30);
		nqx_enable_irq(nqx_dev);
		ret = wait_event_interruptible(nqx_dev->read_wq, !nqx_dev->irq_enabled);
		if (ret < 0) {
		nqx_disable_irq(nqx_dev);
		goto err_nfcc_hw_check;
		}

		/* Read Response of RESET command */
		ret = i2c_master_recv(client, nci_reset_rsp, NCI_RESET_RSP_LEN);
		@@ -919,9 +926,12 @@ static int nfcc_hw_check(struct i2c_client client, struct nqx_dev nqx_dev)
		goto reset_enable_gpio;
		goto err_nfcc_hw_check;
		}

		/* hardware dependent delay */
		msleep(30);
		nqx_enable_irq(nqx_dev);
		ret = wait_event_interruptible(nqx_dev->read_wq, !nqx_dev->irq_enabled);
		if (ret < 0) {
		nqx_disable_irq(nqx_dev);
		goto err_nfcc_hw_check;
		}

		/* Read Notification of RESET command */
		ret = i2c_master_recv(client, nci_reset_ntf, NCI_RESET_NTF_LEN);