Commit cd41986e authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

media: VPU: mediatek: don't pass an unused parameter 



The load_requested_vpu() function returns a freed vpu_fw pointer.  It's
not used so it doesn't cause any problems, but Smatch complains about
it:

    drivers/media/platform/mtk-vpu/mtk_vpu.c:578 vpu_load_firmware()
    warn: passing freed memory 'vpu_fw'

We can clean up the code a bit and silence the static checker warning
by not passing the parameter at all.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1611c686

drivers/media/platform/mtk-vpu/mtk_vpu.c

+3 −4
Original line number Diff line number Diff line
@@ -480,12 +480,12 @@ EXPORT_SYMBOL_GPL(vpu_get_plat_device); 


/* load vpu program/data memory */

static int load_requested_vpu(struct mtk_vpu *vpu,

			      const struct firmware *vpu_fw,

			      u8 fw_type)

{

	size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE;

	size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE;

	char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW;

	const struct firmware *vpu_fw;

	size_t dl_size = 0;

	size_t extra_fw_size = 0;

	void *dest;
@@ -539,7 +539,6 @@ int vpu_load_firmware(struct platform_device *pdev) 
	struct mtk_vpu *vpu;

	struct device *dev = &pdev->dev;

	struct vpu_run *run;

	const struct firmware *vpu_fw = NULL;

	int ret;



	if (!pdev) {
@@ -568,14 +567,14 @@ int vpu_load_firmware(struct platform_device *pdev) 
	run->signaled = false;

	dev_dbg(vpu->dev, "firmware request\n");

	/* Downloading program firmware to device*/

	ret = load_requested_vpu(vpu, vpu_fw, P_FW);

	ret = load_requested_vpu(vpu, P_FW);

	if (ret < 0) {

		dev_err(dev, "Failed to request %s, %d\n", VPU_P_FW, ret);

		goto OUT_LOAD_FW;

	}



	/* Downloading data firmware to device */

	ret = load_requested_vpu(vpu, vpu_fw, D_FW);

	ret = load_requested_vpu(vpu, D_FW);

	if (ret < 0) {

		dev_err(dev, "Failed to request %s, %d\n", VPU_D_FW, ret);

		goto OUT_LOAD_FW;