diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-03 08:35:29 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-03 08:35:29 -1000 |
| commit | 295ba6501d2e83b2e66729dc3a7726f80893c920 (patch) | |
| tree | 358d2cefe81968698ceed3aea6999b47fb8b102a /drivers/input/keyboard | |
| parent | a33ab3f94f510b5bc6b74b2d1e9bc585391c2861 (diff) | |
| parent | 071b24b54d2d05fbf39ddbb27dee08abd1d713f3 (diff) | |
| download | linux-295ba6501d2e83b2e66729dc3a7726f80893c920.tar.gz linux-295ba6501d2e83b2e66729dc3a7726f80893c920.tar.bz2 linux-295ba6501d2e83b2e66729dc3a7726f80893c920.zip | |
Merge tag 'input-for-v6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- a fix for regression in input core introduced in 6.11 preventing
re-registering input handlers
- a fix for adp5588-keys driver tyring to disable interrupt 0 at
suspend when devices is used without interrupt
- a fix for edt-ft5x06 to stop leaking regmap structure when probing
fails and to make sure it is not released too early on removal.
* tag 'input-for-v6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: fix regression when re-registering input handlers
Input: adp5588-keys - do not try to disable interrupt 0
Input: edt-ft5x06 - fix regmap leak when probe fails
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index d25d63a807f2..dc734974ce06 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c @@ -822,7 +822,8 @@ static int adp5588_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - disable_irq(client->irq); + if (client->irq) + disable_irq(client->irq); return 0; } @@ -831,7 +832,8 @@ static int adp5588_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - enable_irq(client->irq); + if (client->irq) + enable_irq(client->irq); return 0; } |