Commit 7f26bb13 authored Apr 28, 2019 by Olof Johansson

Merge tag 'scmi-fixes-5.2' of...

Merge tag 'scmi-fixes-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/drivers

ARM SCMI fixes/cleanup for v5.2

1. Fix for of_node reference leak in scmi_mailbox_check by passing
   NULL argument to of_parse_phandle_with_args instead of dummy argument

2. Cleanup of_match_device->data NULL pointer handling using
   of_device_get_match_data() helper

* tag 'scmi-fixes-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  firmware: arm_scmi: replace of_match_device->data with of_device_get_match_data()
  firmware: arm_scmi: fix of_node leak in scmi_mailbox_check

Signed-off-by: Olof Johansson <olof@lixom.net>

parents b94d3ff9 d9350f21

drivers/firmware/arm_scmi/driver.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -654,9 +654,7 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo)

		static int scmi_mailbox_check(struct device_node *np)
		{
		struct of_phandle_args arg;

		return of_parse_phandle_with_args(np, "mboxes", "#mbox-cells", 0, &arg);
		return of_parse_phandle_with_args(np, "mboxes", "#mbox-cells", 0, NULL);
		}

		static int scmi_mbox_free_channel(int id, void p, void data)
		@@ -798,7 +796,9 @@ static int scmi_probe(struct platform_device *pdev)
		return -EINVAL;
		}

		desc = of_match_device(scmi_of_match, dev)->data;
		desc = of_device_get_match_data(dev);
		if (!desc)
		return -EINVAL;

		info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL);
		if (!info)

Admin message