From be024bb2cd6cd51f1f56042f44ea5e64ee97d75a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Apr 2024 16:43:38 +0000 Subject: [PATCH] Revert "media: ttpci: fix two memleaks in budget_av_attach" This reverts commit af37aed04997e644f7e1b52b696b62dcae3cc016 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 --- drivers/media/pci/ttpci/budget-av.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/media/pci/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c index 3766c7aa96f4..38cac508bd72 100644 --- a/drivers/media/pci/ttpci/budget-av.c +++ b/drivers/media/pci/ttpci/budget-av.c @@ -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; }