diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-11-13 18:38:01 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-11-13 18:38:01 -0800 |
| commit | 12234e16b62f33abfae35f99dfabfda196cab89c (patch) | |
| tree | 43e60b128cf4b1efa203c59b1e6374834ee13a8e | |
| parent | c71f2363a274fd03b243451f66cae39d41ff249f (diff) | |
| parent | ded5879e7e7cb4ba7984c942e3b6d1157e40b5cd (diff) | |
| download | focaltech_touch-12234e16b62f33abfae35f99dfabfda196cab89c.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 478053055
Change-Id: I2935209dc9c0f9c977886d68fb8081a5444a184c
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | ft3658/focaltech_core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ft3658/focaltech_core.c b/ft3658/focaltech_core.c index c2a59d7..d778ce7 100644 --- a/ft3658/focaltech_core.c +++ b/ft3658/focaltech_core.c @@ -2610,9 +2610,8 @@ static void fts_suspend_work(struct work_struct *work) #endif #if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) if (ts_data->tbn_register_mask) { - int ret = tbn_release_bus(ts_data->tbn_register_mask); - if (ret == 0) - ts_data->tbn_owner = TBN_AOC; + tbn_release_bus(ts_data->tbn_register_mask); + ts_data->tbn_owner = TBN_AOC; } #endif mutex_unlock(&ts_data->device_mutex); @@ -2628,9 +2627,8 @@ static void fts_resume_work(struct work_struct *work) #if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) if (ts_data->tbn_register_mask) { - int ret = tbn_request_bus(ts_data->tbn_register_mask); - if (ret == 0) - ts_data->tbn_owner = TBN_AP; + tbn_request_bus(ts_data->tbn_register_mask); + ts_data->tbn_owner = TBN_AP; } #endif #if IS_ENABLED(CONFIG_TOUCHSCREEN_PANEL_BRIDGE) |