diff options
author | Wendly Li <wendlyli@google.com> | 2023-05-03 16:22:05 +0000 |
---|---|---|
committer | Wendly Li <wendlyli@google.com> | 2023-07-19 06:18:11 +0000 |
commit | 0dbd10dde449acbcf0074f2af4b662c40ca161de (patch) | |
tree | b60cd64fd861a0d42fd5b258458d150c8b56211a /goodix_ts_core.c | |
parent | f276ef5e12519db650fe3c9223cf0c55f00faecf (diff) | |
download | goodix_touch-android-14.0.0_r0.44.tar.gz |
touch/goodix: fix deadlock between gti and goodixandroid-u-qpr2-beta-1_r0.6android-u-qpr2-beta-1_r0.5android-u-qpr2-beta-1_r0.4android-u-qpr2-beta-1_r0.3android-u-qpr2-beta-1_r0.2android-u-qpr2-beta-1_r0.1android-u-qpr1-beta-2_r0.7android-u-qpr1-beta-2_r0.5android-u-qpr1-beta-2_r0.4android-u-qpr1-beta-2_r0.3android-u-qpr1-beta-2_r0.2android-u-qpr1-beta-2_r0.1android-u-qpr1-beta-2.2_r0.6android-u-qpr1-beta-2.2_r0.5android-u-qpr1-beta-2.2_r0.4android-u-qpr1-beta-2.2_r0.3android-u-qpr1-beta-2.2_r0.2android-u-qpr1-beta-2.2_r0.1android-u-qpr1-beta-2.1_r0.7android-u-qpr1-beta-2.1_r0.5android-u-qpr1-beta-2.1_r0.4android-u-qpr1-beta-2.1_r0.3android-u-qpr1-beta-2.1_r0.2android-u-qpr1-beta-2.1_r0.1android-u-qpr1-beta-1_r0.7android-u-qpr1-beta-1_r0.5android-u-qpr1-beta-1_r0.4android-u-qpr1-beta-1_r0.3android-u-qpr1-beta-1_r0.2android-u-qpr1-beta-1_r0.1android-14.0.0_r0.44android-14.0.0_r0.43android-14.0.0_r0.42android-14.0.0_r0.41android-14.0.0_r0.40android-14.0.0_r0.39android-14.0.0_r0.37android-14.0.0_r0.36android-14.0.0_r0.35android-14.0.0_r0.34android-14.0.0_r0.33android-14.0.0_r0.31android-14.0.0_r0.25android-14.0.0_r0.23android-14.0.0_r0.22android-14.0.0_r0.21android-14.0.0_r0.19android-gs-tangorpro-5.10-u-qpr1-beta2android-gs-tangorpro-5.10-android14-qpr1-betaandroid-gs-tangorpro-5.10-android14-qpr1android-gs-raviole-5.10-u-qpr1-beta2android-gs-raviole-5.10-android14-qpr1-betaandroid-gs-raviole-5.10-android14-qpr1android-gs-pantah-5.10-u-qpr1-beta2android-gs-pantah-5.10-android14-qpr1-betaandroid-gs-pantah-5.10-android14-qpr1android-gs-lynx-5.10-u-qpr1-beta2android-gs-lynx-5.10-android14-qpr1-betaandroid-gs-lynx-5.10-android14-qpr1android-gs-felix-5.10-u-qpr1-beta2android-gs-felix-5.10-android14-qpr1-betaandroid-gs-felix-5.10-android14-qpr1android-gs-bluejay-5.10-u-qpr1-beta2android-gs-bluejay-5.10-android14-qpr1-betaandroid-gs-bluejay-5.10-android14-qpr1
Bug: 289696186
Test: tap screen and cat ss_diff
Change-Id: Ibbaad2bc0c388630b89b161ab8af6a9b47d05f7f
Signed-off-by: Wendly Li <wendlyli@google.com>
Diffstat (limited to 'goodix_ts_core.c')
-rw-r--r-- | goodix_ts_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c index e42836c..13ef6ff 100644 --- a/goodix_ts_core.c +++ b/goodix_ts_core.c @@ -1004,8 +1004,7 @@ static int get_self_sensor_data( cmd->buffer = (u8 *)cd->self_sensing_data; cmd->size = (tx + rx) * sizeof(uint16_t); } else { - /* disable irq & close esd */ - cd->hw_ops->irq_enable(cd, false); + /* disable esd */ goodix_ts_blocking_notify(NOTIFY_ESD_OFF, NULL); ret = -EINVAL; @@ -1022,8 +1021,7 @@ static int get_self_sensor_data( cmd->size = (tx + rx) * sizeof(uint16_t); } - /* enable irq & esd */ - cd->hw_ops->irq_enable(cd, true); + /* enable esd */ goodix_ts_blocking_notify(NOTIFY_ESD_ON, NULL); } return ret; |