Merge tag 'media/v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / drivers / media / pci / ttpci / budget-av.c

diff --git a/drivers/media/pci/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c
index 230b104..a47c585 100644 (file)
--- a/drivers/media/pci/ttpci/budget-av.c
+++ b/drivers/media/pci/ttpci/budget-av.c
@@ -1463,7 +1463,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;
                }
@@ -1472,9 +1473,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;
                }