Subversion Repositories shark

Compare Revisions

This comparison shows the changes necessary to convert path

→ /shark/trunk/drivers/bttv/ @ 607

→ /shark/trunk/drivers/bttv/ @ 608

↔ Reverse comparison
Compare Path: Rev

With Path: Rev

Ignore whitespace Rev 607 → Rev 608

 /shark/trunk/drivers/bttv/bttv-driver.c
 ,7 → 1276,7
                 free_btres(btv,fh,RESOURCE_OVERLAY);
         if (NULL != old) {
                 dprintk("switch_overlay: old=%x state is %d\n",(int)old,old->vb.state);
-                //bttv_dma_free(btv, old);
+                bttv_dma_free(btv, old);
                 kfree(old);
         }
         dprintk("switch_overlay: done\n");

 /shark/trunk/drivers/bttv/bttv-risc.c
 ,7 → 497,7
 {
         if (in_interrupt())
                 BUG();
-        videobuf_waiton(&buf->vb,0,0);
+        //videobuf_waiton(&buf->vb,0,0);
         //videobuf_dma_pci_unmap(btv->dev, &buf->vb.dma);
         //videobuf_dma_free(&buf->vb.dma);
         btcx_riscmem_free(btv->dev,&buf->bottom);