Merge 4.4-rc5 into staging-next

We want those fixes in here for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2015-12-13 19:23:01 -08:00
817 changed files with 9994 additions and 5232 deletions

View File

@@ -839,8 +839,10 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
for_each_available_child_of_node(node, child) {
ret = vadc_get_dt_channel_data(vadc->dev, &prop, child);
if (ret)
if (ret) {
of_node_put(child);
return ret;
}
vadc->chan_props[index] = prop;