diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-03-28 02:04:13 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2023-03-28 02:04:13 +0000 |
| commit | f8c9aceef9c15231221858aafc0f374645d13ae6 (patch) | |
| tree | 856b527a8320117919ca91a2c14fdfdb7c0f848d | |
| parent | 07289fb2d586ead7185b02d624d5222bdd807eaf (diff) | |
| parent | 08b2590d2f48a0741f300fbae668df7383c88bef (diff) | |
| download | felix-f8c9aceef9c15231221858aafc0f374645d13ae6.tar.gz | |
Merge "ftm5: Enable interrupt at the end of firmware update" into android13-gs-pixel-5.10-udc
| -rw-r--r-- | touch/ftm5/fts.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/touch/ftm5/fts.c b/touch/ftm5/fts.c index be1a350..804ccb6 100644 --- a/touch/ftm5/fts.c +++ b/touch/ftm5/fts.c @@ -4521,12 +4521,6 @@ static int fts_interrupt_install(struct fts_ts_info *info) install_handler(info, STATUS_UPDATE, status); install_handler(info, USER_REPORT, user_report); - /* disable interrupts in any case */ - error = fts_enableInterrupt(info, false); - if (error) { - return error; - } - error = goog_request_threaded_irq(info->gti, info->client->irq, fts_isr, fts_interrupt_handler, IRQF_ONESHOT | IRQF_TRIGGER_LOW, FTS_TS_DRV_NAME, info); @@ -4535,8 +4529,13 @@ static int fts_interrupt_install(struct fts_ts_info *info) if (error) { dev_err(info->dev, "Request irq failed\n"); kfree(info->event_dispatch_table); + goto exit; } + /* disable interrupts in any case */ + error = fts_enableInterrupt(info, false); + +exit: return error; } |