Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 620 → Rev 621

/shark/trunk/drivers/bttv/bttv-risc.c
404,9 → 404,9
cmd |= BT848_RISC_IRQ;
cmd |= (irqflags & 0x0f) << 16;
cmd |= (~irqflags & 0x0f) << 20;
mod_timer(&btv->timeout, jiffies26+BTTV_TIMEOUT);
//mod_timer(&btv->timeout, jiffies26+BTTV_TIMEOUT);
} else {
del_timer(&btv->timeout);
//del_timer(&btv->timeout);
}
btv->main.cpu[RISC_SLOT_LOOP] = cpu_to_le32(cmd);
497,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);