3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index af298358e822..a8429ebfa8a2 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -80,7 +80,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
         return 0;
 }
 
-static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
+static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len)
 {
         int err;
         struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = buf, .len = len };
@@ -111,7 +111,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,
         return 0;
 }
 
-static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 len)
+static int nxt200x_readbytes(struct nxt200x_state *state, u8 reg, u8 *buf, u8 len)
 {
         u8 reg2 [] = { reg };
 
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 6afe12aaca4e..16cf2fdd5d7d 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -88,7 +88,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 reg, const u8 *buf,
         return 0;
 }
 
-static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len)
+static int i2c_readbytes(struct or51211_state *state, u8 reg, u8 *buf, int len)
 {
         int err;
         struct i2c_msg msg;
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 7072cdf74ed4..ca421cc84f8f 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -809,7 +809,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
         dprintk("vino_free_buffer_with_count(): count = %d\n", count);
 
         for (i = 0; i < count; i++) {
-                ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                ClearPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
                 dma_unmap_single(NULL,
                                  fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
                                  PAGE_SIZE, DMA_FROM_DEVICE);
@@ -887,7 +887,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -974,7 +974,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has