These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / pci / bt8xx / bttv-driver.c

diff --git a/kernel/drivers/media/pci/bt8xx/bttv-driver.c b/kernel/drivers/media/pci/bt8xx/bttv-driver.c
index bc12060..15a4ebc 100644 (file)
--- a/kernel/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/kernel/drivers/media/pci/bt8xx/bttv-driver.c
@@ -2676,7 +2676,8 @@ static int bttv_s_fbuf(struct file *file, void *f,
                fh->ov.w.height = fb->fmt.height;
                btv->init.ov.w.width  = fb->fmt.width;
                btv->init.ov.w.height = fb->fmt.height;
-                       kfree(fh->ov.clips);
+
+               kfree(fh->ov.clips);
                fh->ov.clips = NULL;
                fh->ov.nclips = 0;
 
@@ -3624,13 +3625,10 @@ static void
 bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,
                    unsigned int state)
 {
-       struct timeval ts;
-
        if (NULL == wakeup)
                return;
 
-       v4l2_get_timestamp(&ts);
-       wakeup->vb.ts = ts;
+       v4l2_get_timestamp(&wakeup->vb.ts);
        wakeup->vb.field_count = btv->field_count;
        wakeup->vb.state = state;
        wake_up(&wakeup->vb.done);
@@ -4238,6 +4236,7 @@ fail0:
                iounmap(btv->bt848_mmio);
        release_mem_region(pci_resource_start(btv->c.pci,0),
                           pci_resource_len(btv->c.pci,0));
+       pci_disable_device(btv->c.pci);
        return result;
 }
 
@@ -4281,6 +4280,7 @@ static void bttv_remove(struct pci_dev *pci_dev)
        iounmap(btv->bt848_mmio);
        release_mem_region(pci_resource_start(btv->c.pci,0),
                           pci_resource_len(btv->c.pci,0));
+       pci_disable_device(btv->c.pci);
 
        v4l2_device_unregister(&btv->c.v4l2_dev);
        bttvs[btv->c.nr] = NULL;