summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2016-05-09 17:01:01 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-31 14:46:12 +0100
commite9765832134fac7d451ebe7bd2e67d16405c9581 (patch)
tree0177e0ca73e61640674ec45a555d4fa9b6eb981c /drivers
parenta499bc7e0351608016bd85fa580b870b383effeb (diff)
Input: twl6040-vibra - fix DT node memory management
commit c52c545ead97fcc2f4f8ea38f1ae3c23211e09a8 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/misc/twl6040-vibra.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 6d26eecc278c..9ab85a2551c4 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -264,6 +264,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) {