Evolution-X-Devices/kernel_nothing_sm7325
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "media: ttpci: fix two memleaks in budget_av_attach"

Browse Source 
This reverts commit af37aed049 which is
commit d0b07f712bf61e1a3cf23c87c663791c42e50837 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Iabd4008cdfded1c0447ac5a1d3dd83a2f0efbb09
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-04-17 16:43:38 +00:00
parent d873f54a70
commit be024bb2cd
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/pci/ttpci/budget-av.c
View File

@@ -1462,8 +1462,7 @@ 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) {
ttpci_budget_deinit(&budget_av->budget);
kfree(budget_av);
/* fixme: proper cleanup here */
ERR("cannot init vv subsystem\n");
return err;
}
@@ -1472,10 +1471,9 @@ 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))) {
saa7146_vv_release(dev);
ttpci_budget_deinit(&budget_av->budget);
kfree(budget_av);
/* fixme: proper cleanup here */
ERR("cannot register capture v4l2 device\n");
saa7146_vv_release(dev);
return err;
}