Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff7463a1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit e8ca84222e4cd4906a0060b30809788f437383e6 which is
d0b07f712bf61e1a3cf23c87c663791c42e50837 upstream.

It is brought back in an abi-safe way to preserve the bugfix.

Bug: 161946584
Change-Id: I18a0bad4bf9d7ba54dbbefa8d1a4f5636496f12b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7cc70986

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_GRABBER))) {

			/* 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;

		}