2 files changed, 26 insertions, 20 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 67becdd4db60..ef1108c0bf11 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1246,6 +1246,9 @@ static void vpeirq(unsigned long data)
         if (!budget->feeding1 || (newdma == olddma))
                 return;
 
+        /* Ensure streamed PCI data is synced to CPU */
+        pci_dma_sync_sg_for_cpu(budget->dev->pci, budget->pt.slist, budget->pt.nents, PCI_DMA_FROMDEVICE);
+
 #if 0
         /* track rps1 activity */
         printk("vpeirq: %02x Event Counter 1 0x%04x\n",
@@ -2679,8 +2682,8 @@ err_iobuf_vfree_6:
 err_pci_free_5:
         pci_free_consistent(pdev, 8192, av7110->debi_virt, av7110->debi_bus);
 err_saa71466_vfree_4:
-        if (!av7110->grabbing)
-                saa7146_pgtable_free(pdev, &av7110->pt);
+        if (av7110->grabbing)
+                saa7146_vfree_destroy_pgtable(pdev, av7110->grabbing, &av7110->pt);
 err_i2c_del_3:
         i2c_del_adapter(&av7110->i2c_adap);
 err_dvb_unregister_adapter_2:
@@ -2710,7 +2713,7 @@ static int __devexit av7110_detach(struct saa7146_dev* saa)
                 SAA7146_ISR_CLEAR(saa, MASK_10);
                 msleep(50);
                 tasklet_kill(&av7110->vpe_tasklet);
-                saa7146_pgtable_free(saa->pci, &av7110->pt);
+                saa7146_vfree_destroy_pgtable(saa->pci, av7110->grabbing, &av7110->pt);
         }
         av7110_exit_v4l(av7110);
 
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 6b97dc1e6b65..2557ac9620d0 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -195,6 +195,9 @@ static void vpeirq(unsigned long data)
         u32 newdma = saa7146_read(budget->dev, PCI_VDP3);
         u32 count;
 
+        /* Ensure streamed PCI data is synced to CPU */
+        pci_dma_sync_sg_for_cpu(budget->dev->pci, budget->pt.slist, budget->pt.nents, PCI_DMA_FROMDEVICE);
+
         /* nearest lower position divisible by 188 */
         newdma -= newdma % 188;
 
@@ -504,16 +507,16 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         strcpy(budget->i2c_adap.name, budget->card->name);
 
         if (i2c_add_adapter(&budget->i2c_adap) < 0) {
-                dvb_unregister_adapter(&budget->dvb_adapter);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_dvb_unregister;
         }
 
         ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter.proposed_mac);
 
-        if (NULL ==
-            (budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, budget->buffer_size, &budget->pt))) {
+        budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, budget->buffer_size, &budget->pt);
+        if (NULL == budget->grabbing) {
                 ret = -ENOMEM;
-                goto err;
+                goto err_del_i2c;
         }
 
         saa7146_write(dev, PCI_BT_V1, 0x001c0000);
@@ -526,14 +529,16 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         if (bi->type != BUDGET_FS_ACTIVY)
                 saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI);
 
-        if (budget_register(budget) == 0) {
-                return 0;
-        }
-err:
-        i2c_del_adapter(&budget->i2c_adap);
+        if (budget_register(budget) == 0)
+                return 0; /* Everything OK */
+
+        /* An error occurred, cleanup resources */
+        saa7146_vfree_destroy_pgtable(dev->pci, budget->grabbing, &budget->pt);
 
-        vfree(budget->grabbing);
+err_del_i2c:
+        i2c_del_adapter(&budget->i2c_adap);
 
+err_dvb_unregister:
         dvb_unregister_adapter(&budget->dvb_adapter);
 
         return ret;
@@ -555,15 +560,13 @@ int ttpci_budget_deinit(struct budget *budget)
 
         budget_unregister(budget);
 
-        i2c_del_adapter(&budget->i2c_adap);
-
-        dvb_unregister_adapter(&budget->dvb_adapter);
-
         tasklet_kill(&budget->vpe_tasklet);
 
-        saa7146_pgtable_free(dev->pci, &budget->pt);
+        saa7146_vfree_destroy_pgtable(dev->pci, budget->grabbing, &budget->pt);
 
-        vfree(budget->grabbing);
+        i2c_del_adapter(&budget->i2c_adap);
+
+        dvb_unregister_adapter(&budget->dvb_adapter);
 
         return 0;
 }