Unverified Commit bfec808b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6880 media: go7007: fix a memleak in go7007_load_encoder 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YZCF4HTRRJKHSCX5UTZIHB4C5OHBFMYF/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9IB 
 
Link:https://gitee.com/openeuler/kernel/pulls/6880

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents e8142e5c 3360f055

drivers/media/usb/go7007/go7007-driver.c

+5 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int go7007_load_encoder(struct go7007 *go) 
	const struct firmware *fw_entry;

	char fw_name[] = "go7007/go7007fw.bin";

	void *bounce;

	int fw_len, rv = 0;

	int fw_len;

	u16 intr_val, intr_data;



	if (go->boot_fw == NULL) {
@@ -117,9 +117,11 @@ static int go7007_load_encoder(struct go7007 *go) 
	    go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||

			(intr_val & ~0x1) != 0x5a5a) {

		v4l2_err(go, "error transferring firmware\n");

		rv = -1;

		kfree(go->boot_fw);

		go->boot_fw = NULL;

		return -1;

	}

	return rv;

	return 0;

}



MODULE_FIRMWARE("go7007/go7007fw.bin");