aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-01-08 20:15:06 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-01-08 20:40:52 -0500
commit5b189201993ab03001a398de731045bfea90c689 (patch)
tree4a40a7f02e4abba352bf42020b5484bc8ec6eac0
parent02a0d9216d4daf6a58d88642bd2da2c78c327552 (diff)
Input: twl4030-vibra - fix sibling-node lookup
A helper purported to look up a child node based on its name was using the wrong of-helper and ended up prematurely freeing the parent of-node while searching the whole device tree depth-first starting at the parent node. Fixes: 64b9e4d803b1 ("input: twl4030-vibra: Support for DT booted kernel") Fixes: e661d0a04462 ("Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning") Cc: stable <stable@vger.kernel.org> # 3.7 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/twl4030-vibra.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 6c51d404874b..c37aea9ac272 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -178,12 +178,14 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
178 twl4030_vibra_suspend, twl4030_vibra_resume); 178 twl4030_vibra_suspend, twl4030_vibra_resume);
179 179
180static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata, 180static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata,
181 struct device_node *node) 181 struct device_node *parent)
182{ 182{
183 struct device_node *node;
184
183 if (pdata && pdata->coexist) 185 if (pdata && pdata->coexist)
184 return true; 186 return true;
185 187
186 node = of_find_node_by_name(node, "codec"); 188 node = of_get_child_by_name(parent, "codec");
187 if (node) { 189 if (node) {
188 of_node_put(node); 190 of_node_put(node);
189 return true; 191 return true;