Merge tag 'vexpress-fixes-4.8-rc' of... (8184a34f) · Commits · 戴 / test

Merge tag 'vexpress-fixes-4.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes SCPI/Vexpress fixes for v4.8-rc Couple of minor fixes to add missing of_node_put after calling of_parse_phandle in SCPI and vexpress-config bus drivers(Peter Chen) * tag 'vexpress-fixes-4.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux : firmware: arm_scpi: add missing of_node_put after calling of_parse_phandle bus: vexpress-config: add missing of_node_put after calling of_parse_phandle Signed-off-by:

Olof Johansson <olof@lixom.net>

drivers/bus/vexpress-config.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,7 @@ static int vexpress_config_populate(struct device_node *node)

		parent = class_find_device(vexpress_config_class, NULL, bridge,
		vexpress_config_node_match);
		of_node_put(bridge);
		if (WARN_ON(!parent))
		return -ENODEV;

drivers/firmware/arm_scpi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -709,9 +709,10 @@ static int scpi_probe(struct platform_device *pdev)
		struct mbox_client *cl = &pchan->cl;
		struct device_node *shmem = of_parse_phandle(np, "shmem", idx);

		if (of_address_to_resource(shmem, 0, &res)) {
		ret = of_address_to_resource(shmem, 0, &res);
		of_node_put(shmem);
		if (ret) {
		dev_err(dev, "failed to get SCPI payload mem resource\n");
		ret = -EINVAL;
		goto err;
		}

Admin message