summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 18:14:57 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 18:14:57 -0300
commit6d2a77ee876428f13d4e34ecc252fa6ca4f3997a (patch)
treed785775d46700b6aace81d867bdd963bd5a528ef /linux/drivers/media/video/cx23885/cx23885-core.c
parent00ac7fc0004f2e088ae6fa1657735105e50968b5 (diff)
parent44643ca470044ddd9b01cf78c51ec22b1e0494a7 (diff)
downloadmediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.gz
mediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index 49d8620a3..95289bb54 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -824,7 +824,7 @@ static void cx23885_dev_unregister(struct cx23885_dev *dev)
iounmap(dev->lmmio);
}
-static u32* cx23885_risc_field(u32 *rp, struct scatterlist *sglist,
+static __le32* cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,
unsigned int offset, u32 sync_line,
unsigned int bpl, unsigned int padding,
unsigned int lines)
@@ -884,7 +884,7 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
unsigned int padding, unsigned int lines)
{
u32 instructions, fields;
- u32 *rp;
+ __le32 *rp;
int rc;
fields = 0;
@@ -925,7 +925,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
unsigned int lines)
{
u32 instructions;
- u32 *rp;
+ __le32 *rp;
int rc;
/* estimate risc mem: worst case is one write per page border +
@@ -952,7 +952,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
u32 reg, u32 mask, u32 value)
{
- u32 *rp;
+ __le32 *rp;
int rc;
if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)