diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-08-25 17:00:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-08-25 17:00:10 -0700 |
| commit | 8184a34f1124c6529611c3e77e361f087ce2ee1c (patch) | |
| tree | f157bfe663b65c7ee882b9783b58d072670ff3c2 /drivers/firmware | |
| parent | Merge tag 'gpmc-omap-v4.8-rc1' of https://github.com/rogerq/linux into fixes (diff) | |
| parent | firmware: arm_scpi: add missing of_node_put after calling of_parse_phandle (diff) | |
| download | linux-dev-8184a34f1124c6529611c3e77e361f087ce2ee1c.tar.xz linux-dev-8184a34f1124c6529611c3e77e361f087ce2ee1c.zip | |
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>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/arm_scpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c index 438893762076..ce2bc2a38101 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c @@ -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; } |