Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103878
b: refs/heads/master
c: 3aa7110
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Mauro Carvalho Chehab committed Jul 20, 2008
1 parent 4e3a076 commit 959d9b8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 947a080037c6ae47cfe5072eadbd189e3da27ecd
refs/heads/master: 3aa7110e1c415c38c42ef77be0ef2c7a888b9e16
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/bt8xx/bt878.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct bt878 {
dma_addr_t buf_dma;

u32 risc_size;
u32 *risc_cpu;
__le32 *risc_cpu;
dma_addr_t risc_dma;
u32 risc_pos;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/bt8xx/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -3705,7 +3705,7 @@ static void bttv_risc_disasm(struct bttv *btv,
for (i = 0; i < (risc->size >> 2); i += n) {
printk("%s: 0x%lx: ", btv->c.name,
(unsigned long)(risc->dma + (i<<2)));
n = bttv_risc_decode(risc->cpu[i]);
n = bttv_risc_decode(le32_to_cpu(risc->cpu[i]));
for (j = 1; j < n; j++)
printk("%s: 0x%lx: 0x%08x [ arg #%d ]\n",
btv->c.name, (unsigned long)(risc->dma + ((i+j)<<2)),
Expand Down Expand Up @@ -3774,8 +3774,8 @@ static void bttv_irq_debug_low_latency(struct bttv *btv, u32 rc)
printk("bttv%d: irq: skipped frame [main=%lx,o_vbi=%lx,o_field=%lx,rc=%lx]\n",
btv->c.nr,
(unsigned long)btv->main.dma,
(unsigned long)btv->main.cpu[RISC_SLOT_O_VBI+1],
(unsigned long)btv->main.cpu[RISC_SLOT_O_FIELD+1],
(unsigned long)le32_to_cpu(btv->main.cpu[RISC_SLOT_O_VBI+1]),
(unsigned long)le32_to_cpu(btv->main.cpu[RISC_SLOT_O_FIELD+1]),
(unsigned long)rc);

if (0 == (btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC)) {
Expand Down

0 comments on commit 959d9b8

Please sign in to comment.