diff options
author | H. Nikolaus Schaller <hns@goldelico.com> | 2016-05-10 02:01:01 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-10 02:07:04 +0200 |
commit | c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8 (patch) | |
tree | 0a8b36c9cbe0efda369c08d2dbf8100602663eab /drivers/input/misc | |
parent | Input: max8997-haptic - fix NULL pointer dereference (diff) | |
download | linux-c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8.tar.xz linux-c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8.zip |
Input: twl6040-vibra - fix DT node memory management
commit e7ec014a47e4 ("Input: twl6040-vibra - update for device tree support")
made the separate vibra DT node to a subnode of the twl6040.
It now calls of_find_node_by_name() to locate the "vibra" subnode.
This function has a side effect to call of_node_put on() for the twl6040
parent node passed in as a parameter. This causes trouble later on.
Solution: we must call of_node_get() before of_find_node_by_name()
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r-- | drivers/input/misc/twl6040-vibra.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |