Commit b4e8c0b1 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/linus' into dt/next

parents 58fbe999 5dba5175

drivers/of/of_reserved_mem.c

+3 −1
Original line number Diff line number Diff line
@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, 
	if (!target)

		return -ENODEV;



	if (!of_device_is_available(target))

	if (!of_device_is_available(target)) {

		of_node_put(target);

		return 0;

	}



	rmem = __find_rmem(target);

	of_node_put(target);

drivers/of/unittest.c

+1 −0
Original line number Diff line number Diff line
@@ -1297,6 +1297,7 @@ static int __init unittest_data_add(void) 
	of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node);

	if (!unittest_data_node) {

		pr_warn("%s: No tree to attach; not running tests\n", __func__);

		kfree(unittest_data);

		return -ENODATA;

	}