Commit 283725af authored by Linus Torvalds's avatar Linus Torvalds

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
parents f1774f46 05e0be7c
...@@ -901,7 +901,7 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake) ...@@ -901,7 +901,7 @@ void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)
data->enabled = true; data->enabled = true;
if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) { if (clear_wake && device_may_wakeup(rmi_dev->xport->dev)) {
retval = disable_irq_wake(irq); retval = disable_irq_wake(irq);
if (!retval) if (retval)
dev_warn(&rmi_dev->dev, dev_warn(&rmi_dev->dev,
"Failed to disable irq for wake: %d\n", "Failed to disable irq for wake: %d\n",
retval); retval);
...@@ -936,7 +936,7 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake) ...@@ -936,7 +936,7 @@ void rmi_disable_irq(struct rmi_device *rmi_dev, bool enable_wake)
disable_irq(irq); disable_irq(irq);
if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) { if (enable_wake && device_may_wakeup(rmi_dev->xport->dev)) {
retval = enable_irq_wake(irq); retval = enable_irq_wake(irq);
if (!retval) if (retval)
dev_warn(&rmi_dev->dev, dev_warn(&rmi_dev->dev,
"Failed to enable irq for wake: %d\n", "Failed to enable irq for wake: %d\n",
retval); retval);
......
...@@ -682,7 +682,7 @@ static int wm97xx_probe(struct device *dev) ...@@ -682,7 +682,7 @@ static int wm97xx_probe(struct device *dev)
} }
platform_set_drvdata(wm->battery_dev, wm); platform_set_drvdata(wm->battery_dev, wm);
wm->battery_dev->dev.parent = dev; 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); ret = platform_device_add(wm->battery_dev);
if (ret < 0) if (ret < 0)
goto batt_reg_err; goto batt_reg_err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment