Thread (3 messages) 3 messages, 3 authors, 2017-01-31

Re: [PATCH] Input: synaptics-rmi4 - Fix reversed tests

flat view

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2017-01-31 08:52:06
Also in: kernel-janitors, lkml

On Fri, Jan 27, 2017 at 06:18:27PM +0100, Benjamin Tissoires wrote:
On Jan 27 2017 or thereabouts, Christophe JAILLET wrote:
quoted
These tests looks reversed.
A warning should be displayed if an error is returned, not on success.

Signed-off-by: Christophe JAILLET <redacted>
---
Good catch!

Reviewed-by: Benjamin Tissoires <redacted>
Applied, thank you.
Cheers,
Benjamin

quoted
 drivers/input/rmi4/rmi_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 11447ab1055c..bf5c36e229ba 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -901,7 +901,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);
@@ -936,7 +936,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);
-- 
2.9.3
-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help