diff options
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-pci.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c index 2f76eb3fe..9bc40bdcc 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c @@ -161,8 +161,10 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id, struct pt_regs *regs) fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2; u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0; - deb_irq("%u irq: %08x cur_addr: %08x: cur_pos: %08x, last_cur_pos: %08x ", - jiffies_to_usecs(jiffies - fc_pci->last_irq),v.raw,cur_addr,cur_pos,fc_pci->last_dma1_cur_pos); + deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x ", + jiffies_to_usecs(jiffies - fc_pci->last_irq), + v.raw, (unsigned long long)cur_addr, cur_pos, + fc_pci->last_dma1_cur_pos); fc_pci->last_irq = jiffies; /* buffer end was reached, restarted from the beginning diff --git a/v4l/ChangeLog b/v4l/ChangeLog index fc61390dd..f5927b9f9 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2006-01-22 20:56 mkrufky + + * linux/drivers/media/dvb/b2c2/flexcop-pci.c: (flexcop_pci_isr): + - Fix printk type warning: + format '%08x' expects type 'unsigned int', + but argument 4 has type 'dma_addr_t' + + Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-22 19:43 mrechberger * linux/drivers/media/video/em28xx/em28xx-cards.c: |