Input: gpio_keys - fix leaking DT node references

dtor · dtor · commit 0860913b02c2 · 2016-11-07T16:24:30.000-08:00
for_each_available_child_of_node(node, pp) takes reference to 'pp' and
drops it when attempting next iteration. However if we exit the loop early
we need to drop the reference ourselves.

Tested-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
@@ -659,6 +659,7 @@ gpio_keys_get_devtree_pdata(struct device *dev)
 					dev_err(dev,
 						"Failed to get gpio flags, error: %d\n",
 						error);
+				of_node_put(pp);
 				return ERR_PTR(error);
 			}
 		} else {
@@ -669,12 +670,14 @@ gpio_keys_get_devtree_pdata(struct device *dev)
 
 		if (!gpio_is_valid(button->gpio) && !button->irq) {
 			dev_err(dev, "Found button without gpios or irqs\n");
+			of_node_put(pp);
 			return ERR_PTR(-EINVAL);
 		}
 
 		if (of_property_read_u32(pp, "linux,code", &button->code)) {
 			dev_err(dev, "Button without keycode: 0x%x\n",
 				button->gpio);
+			of_node_put(pp);
 			return ERR_PTR(-EINVAL);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -659,6 +659,7 @@ gpio_keys_get_devtree_pdata(struct device *dev)`
`659`	`659`	`dev_err(dev,`
`660`	`660`	`"Failed to get gpio flags, error: %d\n",`
`661`	`661`	`error);`
	`662`	`+ of_node_put(pp);`
`662`	`663`	`return ERR_PTR(error);`
`663`	`664`	`}`
`664`	`665`	`} else {`
`@@ -669,12 +670,14 @@ gpio_keys_get_devtree_pdata(struct device *dev)`
`669`	`670`
`670`	`671`	`if (!gpio_is_valid(button->gpio) && !button->irq) {`
`671`	`672`	`dev_err(dev, "Found button without gpios or irqs\n");`
	`673`	`+ of_node_put(pp);`
`672`	`674`	`return ERR_PTR(-EINVAL);`
`673`	`675`	`}`
`674`	`676`
`675`	`677`	`if (of_property_read_u32(pp, "linux,code", &button->code)) {`
`676`	`678`	`dev_err(dev, "Button without keycode: 0x%x\n",`
`677`	`679`	`button->gpio);`
	`680`	`+ of_node_put(pp);`
`678`	`681`	`return ERR_PTR(-EINVAL);`
`679`	`682`	`}`
`680`	`683`