[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    Input: synaptics-rmi4 - fix reversed conditions in enable/disable_irq_wake
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2017-01-31 22:19:10
Message-ID: 20170131221910.95DBD660834 () gitolite ! kernel ! org
[Download RAW message or body]

Web:        https://git.kernel.org/torvalds/c/05e0be7c900797e9164976a6014d534ce3035909
Commit:     05e0be7c900797e9164976a6014d534ce3035909
Parent:     3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c
Refname:    refs/heads/master
Author:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>
AuthorDate: Tue Jan 31 00:47:30 2017 -0800
Committer:  Dmitry Torokhov <dmitry.torokhov@gmail.com>
CommitDate: Tue Jan 31 00:51:06 2017 -0800

    Input: synaptics-rmi4 - fix reversed conditions in enable/disable_irq_wake
    
    These tests are reversed.  A warning should be displayed if an error is
    returned, not on success.
    
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 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 11447ab..bf5c36e 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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]