diff options
| author | Joey Lin <linjoey@google.com> | 2022-11-29 02:55:24 +0000 |
|---|---|---|
| committer | Joey Lin <linjoey@google.com> | 2022-11-29 02:55:24 +0000 |
| commit | 9ebd8149f84c3a64176c08d9df0c27d00a1b8fd7 (patch) | |
| tree | 38ef9c8f1697f2c13e5a5b38726e692386e19af7 | |
| parent | ffb56e01472070d4de24eba0e771ea53bfd32a4f (diff) | |
| parent | d43ef339a04e0d0ecd4e03674e285c1e90c14cf1 (diff) | |
| download | novatek_touch-9ebd8149f84c3a64176c08d9df0c27d00a1b8fd7.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
Fix the nt36xxx/nt36xxx.c build break.
Bug: 255246572
Change-Id: I48bcf033d7db2a6bb26b8a409c599243f6458927
Signed-off-by: Joey Lin <linjoey@google.com>
| -rw-r--r-- | nt36xxx/nt36xxx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nt36xxx/nt36xxx.c b/nt36xxx/nt36xxx.c index a2437cd..71d4d20 100644 --- a/nt36xxx/nt36xxx.c +++ b/nt36xxx/nt36xxx.c @@ -2882,7 +2882,9 @@ return: int nvt_ts_suspend(struct device *dev) { uint8_t buf[4] = {0}; +#ifndef GOOG_TOUCH_INTERFACE uint32_t i = 0; +#endif if (!ts->bTouchIsAwake) { NVT_LOG("Touch is already suspend\n"); @@ -2922,9 +2924,10 @@ int nvt_ts_suspend(struct device *dev) } nvt_set_page(ts->mmap->EVENT_BUF_ADDR); +#ifndef GOOG_TOUCH_INTERFACE /* release all touches */ goog_input_lock(ts->gti); - goog_input_set_timestamp(ts->gti, ts->input_dev, KTIME_RELEASE_ALL); + goog_input_set_timestamp(ts->gti, ts->input_dev, ktime_get()); if (ts->report_protocol == REPORT_PROTOCOL_B) { for (i = 0; i < ts->max_touch_num; i++) { goog_input_mt_slot(ts->gti, ts->input_dev, i); @@ -2940,6 +2943,7 @@ int nvt_ts_suspend(struct device *dev) goog_input_sync(ts->gti, ts->input_dev); goog_input_unlock(ts->gti); +#endif /* release pen event */ if (ts->pen_support) { |