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

!7121 [sync] PR-7086: media: ttpci: fix two memleaks in budget_av_attach 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7086 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6MLITQM7XRPPEVE25KKT7ZEYQ2GRQ4LH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9IH 
 
Link:https://gitee.com/openeuler/kernel/pulls/7121

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a7bbe086 f54408e4

drivers/media/pci/ttpci/budget-av.c

+5 −3
Original line number Diff line number Diff line
@@ -1462,7 +1462,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
		budget_av->has_saa7113 = 1;

		err = saa7146_vv_init(dev, &vv_data);

		if (err != 0) {

			/* fixme: proper cleanup here */

			ttpci_budget_deinit(&budget_av->budget);

			kfree(budget_av);

			ERR("cannot init vv subsystem\n");

			return err;

		}
@@ -1471,9 +1472,10 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
		vv_data.vid_ops.vidioc_s_input = vidioc_s_input;



		if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_VIDEO))) {

			/* fixme: proper cleanup here */

			ERR("cannot register capture v4l2 device\n");

			saa7146_vv_release(dev);

			ttpci_budget_deinit(&budget_av->budget);

			kfree(budget_av);

			ERR("cannot register capture v4l2 device\n");

			return err;

		}