Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88403eb1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "NFC: Add recovery mechanism for i2_master_recv error"

parents a218911f 5524fcb9

drivers/nfc/nq-nci.c

+5 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ static int nfcc_hw_check(struct i2c_client *client, struct nqx_dev *nqx_dev) 
{

	int ret = 0;



	int gpio_retry_count = 0;

	unsigned char init_rsp_len = 0;

	unsigned int enable_gpio = nqx_dev->en_gpio;

	char *nci_reset_cmd = NULL;
@@ -707,6 +708,7 @@ static int nfcc_hw_check(struct i2c_client *client, struct nqx_dev *nqx_dev) 
		goto done;

	}



reset_enable_gpio:

	/* making sure that the NFCC starts in a clean state. */

	gpio_set_value(enable_gpio, 0);/* ULPM: Disable */

	/* hardware dependent delay */
@@ -734,6 +736,9 @@ static int nfcc_hw_check(struct i2c_client *client, struct nqx_dev *nqx_dev) 
	if (ret < 0) {

		dev_err(&client->dev,

		"%s: - i2c_master_recv Error\n", __func__);

		gpio_retry_count = gpio_retry_count + 1;

		if (gpio_retry_count < MAX_RETRY_COUNT)

			goto reset_enable_gpio;

		goto err_nfcc_hw_check;

	}

	nci_init_cmd[0] = 0x20;