summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-29 07:19:06 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-29 07:19:06 -0300
commit8178f50745e3f58d2de7196874a86077e51e2d0a (patch)
treeb33ea445532b46c0153289b134661c6ca5adc98c /linux/drivers/media/video/cx23885/cx23885-core.c
parent94e2f24ecce195fb81e8da1e809e3537f58dce6a (diff)
parent1aaedcfcedc4290350ffe058a6f1e7af9319ff3c (diff)
downloadmediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.gz
mediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-core.c')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index 95289bb54..a1902d59e 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -292,9 +292,9 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
lines = 6;
BUG_ON(lines < 2);
- cx_write(8 + 0, cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC) );
- cx_write(8 + 4, cpu_to_le32(8) );
- cx_write(8 + 8, cpu_to_le32(0) );
+ cx_write(8 + 0, RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
+ cx_write(8 + 4, 8);
+ cx_write(8 + 8, 0);
/* write CDT */
for (i = 0; i < lines; i++) {
@@ -409,11 +409,11 @@ static void cx23885_risc_disasm(struct cx23885_tsport *port,
dev->name, risc->cpu, (unsigned long)risc->dma);
for (i = 0; i < (risc->size >> 2); i += n) {
printk("%s: %04d: ", dev->name, i);
- n = cx23885_risc_decode(risc->cpu[i]);
+ n = cx23885_risc_decode(le32_to_cpu(risc->cpu[i]));
for (j = 1; j < n; j++)
printk("%s: %04d: 0x%08x [ arg #%d ]\n",
dev->name, i + j, risc->cpu[i + j], j);
- if (risc->cpu[i] == RISC_JUMP)
+ if (risc->cpu[i] == cpu_to_le32(RISC_JUMP))
break;
}
}