Merge "input: touchscreen: synaptics_dsx_2.6: Enable poll mode for reflash" (e3c52fec) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_fw_update.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1951,7 +1951,7 @@ static int fwu_write_f34_v7_blocks(unsigned char *block_ptr,
		return retval;
		}

		retval = fwu_wait_for_idle(WRITE_WAIT_MS, false);
		retval = fwu_wait_for_idle(WRITE_WAIT_MS, true);
		if (retval < 0) {
		dev_err(rmi4_data->pdev->dev.parent,
		"%s: Failed to wait for idle status (%d blocks remaining)\n",
		@@ -1961,6 +1961,8 @@ static int fwu_write_f34_v7_blocks(unsigned char *block_ptr,

		block_ptr += (transfer * fwu->block_size);
		remaining -= transfer;
		dev_dbg(rmi4_data->pdev->dev.parent, "%s: remaining %d\n",
		__func__, remaining);
		} while (remaining);

		return 0;
		@@ -2010,7 +2012,7 @@ static int fwu_write_f34_v5v6_blocks(unsigned char *block_ptr,
		return retval;
		}

		retval = fwu_wait_for_idle(WRITE_WAIT_MS, false);
		retval = fwu_wait_for_idle(WRITE_WAIT_MS, true);
		if (retval < 0) {
		dev_err(rmi4_data->pdev->dev.parent,
		"%s: Failed to wait for idle status (block %d)\n",
		@@ -2019,6 +2021,8 @@ static int fwu_write_f34_v5v6_blocks(unsigned char *block_ptr,
		}

		block_ptr += fwu->block_size;
		dev_dbg(rmi4_data->pdev->dev.parent, "%s: remaining %d\n",
		__func__, block_cnt - blk);
		}

		return 0;