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

Pull input subsystem fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: twl6040-vibra - fix DT node memory management
  Input: max8997-haptic - fix NULL pointer dereference
  Input: byd - update copyright header

2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index a806ba3818f7..8d6326d7e7be 100644
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -255,12 +255,14 @@ static int max8997_haptic_probe(struct platform_device *pdev)
         struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         const struct max8997_platform_data *pdata =
                                         dev_get_platdata(iodev->dev);
-        const struct max8997_haptic_platform_data *haptic_pdata =
-                                        pdata->haptic_pdata;
+        const struct max8997_haptic_platform_data *haptic_pdata = NULL;
         struct max8997_haptic *chip;
         struct input_dev *input_dev;
         int error;
 
+        if (pdata)
+                haptic_pdata = pdata->haptic_pdata;
+
         if (!haptic_pdata) {
                 dev_err(&pdev->dev, "no haptic platform data\n");
                 return -EINVAL;
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index df3581f60628..42de34b92996 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -257,6 +257,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
         int vddvibr_uV = 0;
         int error;
 
+        of_node_get(twl6040_core_dev->of_node);
         twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,
                                                  "vibra");
         if (!twl6040_core_node) {