summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-09-06 14:02:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:00 -0200
commit2796073a3d9cc4f610f1e68b3f62c197d86577ab (patch)
tree13762336b24c7ecb0d5cbb7724e3d8d54be321cd
parentf2a01a0027b29f682c3833d582e2827a4690f661 (diff)
V4L/DVB (8939): cx18: fix sparse warnings
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx18/cx18-driver.c2
-rw-r--r--drivers/media/video/cx18/cx18-io.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 202b28190148..4de7b501f207 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -82,7 +82,7 @@ static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
static unsigned cardtype_c = 1;
static unsigned tuner_c = 1;
static unsigned radio_c = 1;
-static int mmio_ndelay_c = 1;
+static unsigned mmio_ndelay_c = 1;
static char pal[] = "--";
static char secam[] = "--";
static char ntsc[] = "-";
diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c
index 5d07b0fd8a17..55d1df93292a 100644
--- a/drivers/media/video/cx18/cx18-io.c
+++ b/drivers/media/video/cx18/cx18-io.c
@@ -27,7 +27,7 @@
void cx18_memcpy_fromio(struct cx18 *cx, void *to,
const void __iomem *from, unsigned int len)
{
- const u8 *src = from;
+ const u8 __iomem *src = from;
u8 *dst = to;
/* Align reads on the CX23418's addresses */
@@ -61,7 +61,7 @@ void cx18_memcpy_fromio(struct cx18 *cx, void *to,
void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)
{
- u8 *dst = addr;
+ u8 __iomem *dst = addr;
u16 val2 = val | (val << 8);
u32 val4 = val2 | (val2 << 16);