From 7ddcbe5f894454872b9af500ae55ed1b3ed1f1e8 Mon Sep 17 00:00:00 2001 From: wengjun1 Date: Tue, 21 Aug 2018 16:50:18 +0800 Subject: [PATCH] DLKM: input: Improve novatek touch driver Fixed the logic which causes the node /proc/nvt_read_data can not to be created. Change-Id: I6e0814297c4ef683ef79055072d2f5e7e385006a Signed-off-by: wengjun1 Reviewed-on: https://gerrit.mot.com/1230750 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jialei Hao Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../input/touchscreen/nova_mmi/nt36xxx_mp_ctrlram.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/nova_mmi/nt36xxx_mp_ctrlram.c b/drivers/input/touchscreen/nova_mmi/nt36xxx_mp_ctrlram.c index 1f7c154ce887..f577b606e0f3 100644 --- a/drivers/input/touchscreen/nova_mmi/nt36xxx_mp_ctrlram.c +++ b/drivers/input/touchscreen/nova_mmi/nt36xxx_mp_ctrlram.c @@ -1952,29 +1952,32 @@ return: *******************************************************/ int32_t nvt_mp_proc_init(void) { + int32_t ret = 0; NVT_proc_selftest_entry = proc_create("nvt_selftest", 0444, NULL, &nvt_selftest_fops); if (NVT_proc_selftest_entry == NULL) { NVT_ERR("create /proc/nvt_selftest Failed!\n"); - return -1; + ret = -1; } else { if (nvt_mp_buffer_init()) { NVT_ERR("Allocate mp memory failed\n"); - return -1; + ret = -1; } else { NVT_LOG("create /proc/nvt_selftest Succeeded!\n"); } - return 0; + ret = 0; } #if NVT_TOUCH_MP_LENOVO + if (ret == 0) { NVT_proc_selftest_read_data = proc_create("nvt_read_data", 0444, NULL, &nvt_read_data_fops); if (NVT_proc_selftest_read_data == NULL) { NVT_ERR("create /proc/nvt_read_data Failed!\n"); - return -1; + ret = -1; } else { NVT_LOG("create /proc/nvt_read_data Succeeded!\n"); } +} #endif - return 0; + return ret; } void nvt_mp_proc_remove(void)