diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 19:03:22 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 19:03:22 +0100 |
| commit | 7b179e251ba089898b4e8e6d065be8ae2c0a4a3e (patch) | |
| tree | d8c5fe6a2d5330da4d7e53e8b85c1540e1fa404a /drivers/input/rmi4/rmi_driver.c | |
| parent | Input: soc_button_array - use NULL for GPIO connection ID (diff) | |
| parent | Input: sparse-keymap - use a managed allocation for keymap copy (diff) | |
| download | linux-7b179e251ba089898b4e8e6d065be8ae2c0a4a3e.tar.xz linux-7b179e251ba089898b4e8e6d065be8ae2c0a4a3e.zip | |
Merge branch 'ib/4.10-sparse-keymap-managed' into next
This brings in version of sparse keymap code that uses managed memory.
Diffstat (limited to 'drivers/input/rmi4/rmi_driver.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 746255830b47..d64fc92858f2 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -914,7 +914,7 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) data->enabled = true; if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) { retval = disable_irq_wake(irq); - if (!retval) + if (retval) dev_warn(&rmi_dev->dev, "Failed to disable irq for wake: %d\n", retval); @@ -949,7 +949,7 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake) disable_irq(irq); if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) { retval = enable_irq_wake(irq); - if (!retval) + if (retval) dev_warn(&rmi_dev->dev, "Failed to enable irq for wake: %d\n", retval); |