]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: venus: firmware: fix leaked of_node references
authorWen Yang <wen.yang99@zte.com.cn>
Mon, 6 May 2019 07:05:15 +0000 (03:05 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:10:14 +0000 (09:10 +0200)
[ Upstream commit 2c41cc0be07b5ee2f1167f41cd8a86fc5b53d82c ]

The call to of_parse_phandle returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.

Detected by coccinelle with the following warnings:
drivers/media/platform/qcom/venus/firmware.c:90:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 82, but without a corresponding object release within this function.
drivers/media/platform/qcom/venus/firmware.c:94:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 82, but without a corresponding object release within this function.
drivers/media/platform/qcom/venus/firmware.c:128:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 82, but without a corresponding object release within this function.

Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/qcom/venus/firmware.c

index 1eba23409ff32cc944d13efbbb05a741e28b783b..d3d1748a7ef6c8ffc086f6e2b607d0624d9a9d8f 100644 (file)
@@ -78,11 +78,11 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 
        ret = of_address_to_resource(node, 0, &r);
        if (ret)
-               return ret;
+               goto err_put_node;
 
        ret = request_firmware(&mdt, fwname, dev);
        if (ret < 0)
-               return ret;
+               goto err_put_node;
 
        fw_size = qcom_mdt_get_size(mdt);
        if (fw_size < 0) {
@@ -116,6 +116,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
        memunmap(mem_va);
 err_release_fw:
        release_firmware(mdt);
+err_put_node:
+       of_node_put(node);
        return ret;
 }