From 984e2d89fafdb39b0ae4de53bf45e39b9fa92fed Mon Sep 17 00:00:00 2001 From: litong Date: Tue, 25 Aug 2020 20:56:06 +0800 Subject: [PATCH] Instead of vfs_read with kernel_read TP: Instead of vfs_read with kernel_read 8350 rebase Lahaina.LA.1.0.r1-00375-STD.PROD-1 kernel msm5.14 remove vfs_write EXPORT. Change-Id: Ia6f45a744373eaf1a6facab0870a082e6d72b617 Reviewed-on: https://gerrit.mot.com/1732831 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- drivers/input/touchscreen/sec_mmi/sec_ts_fw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/sec_mmi/sec_ts_fw.c b/drivers/input/touchscreen/sec_mmi/sec_ts_fw.c index 0ed37612f922..7dce0f0dcaea 100644 --- a/drivers/input/touchscreen/sec_mmi/sec_ts_fw.c +++ b/drivers/input/touchscreen/sec_mmi/sec_ts_fw.c @@ -894,9 +894,13 @@ static int sec_ts_load_fw_from_ums(struct sec_ts_data *ts) filp_close(fp, NULL); goto open_err; } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) + nread = kernel_read(fp, (char __user *)fw_data, + fw_size, &fp->f_pos); +#else nread = vfs_read(fp, (char __user *)fw_data, fw_size, &fp->f_pos); - +#endif input_info(true, ts->dev, "%s: start, file path %s, size %ld Bytes\n", __func__, SEC_TS_DEFAULT_UMS_FW, fw_size);