Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov:
 "A fix for a crash in the wm97xx driver and synaptics-rmi4 will stop
  throwing erroneous warnings."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - fix reversed conditions in enable/disable_irq_wake
  Input: wm97xx - make missing platform data non-fatal

2 files changed, 3 insertions, 3 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);
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 83cf11312fd9..c9d1c91e1887 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -682,7 +682,7 @@ static int wm97xx_probe(struct device *dev)
         }
         platform_set_drvdata(wm->battery_dev, wm);
         wm->battery_dev->dev.parent = dev;
-        wm->battery_dev->dev.platform_data = pdata->batt_pdata;
+        wm->battery_dev->dev.platform_data = pdata ? pdata->batt_pdata : NULL;
         ret = platform_device_add(wm->battery_dev);
         if (ret < 0)
                 goto batt_reg_err;