Bluetooth: btmrvl: add missing of_node_put
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 24 Oct 2015 14:42:32 +0000 (16:42 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 25 Oct 2015 20:03:29 +0000 (21:03 +0100)
for_each_compatible_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.

A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression e;
local idexpression n;
@@

 for_each_compatible_node(n, ...) {
   ... when != of_node_put(n)
       when != e = n
(
   return n;
|
+  of_node_put(n);
?  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btmrvl_main.c

index 6ba22862d788b952f204dbea85e15912d32bee1f..6af917331962409dded11034273af84e98905313 100644 (file)
@@ -516,14 +516,17 @@ static int btmrvl_check_device_tree(struct btmrvl_private *priv)
                ret = of_property_read_u8_array(dt_node, "btmrvl,cal-data",
                                                cal_data + BT_CAL_HDR_LEN,
                                                BT_CAL_DATA_SIZE);
-               if (ret)
+               if (ret) {
+                       of_node_put(dt_node);
                        return ret;
+               }
 
                BT_DBG("Use cal data from device tree");
                ret = btmrvl_download_cal_data(priv, cal_data,
                                               BT_CAL_DATA_SIZE);
                if (ret) {
                        BT_ERR("Fail to download calibrate data");
+                       of_node_put(dt_node);
                        return ret;
                }
        }