4 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 275df65fde99..5394de2e4ce0 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -97,7 +97,7 @@ static ssize_t dvb_dmxdev_buffer_read(struct dvb_ringbuffer *src,
                 if (avail > todo)
                         avail = todo;
 
-                ret = dvb_ringbuffer_read(src, buf, avail, 1);
+                ret = dvb_ringbuffer_read(src, (u8 *)buf, avail, 1);
                 if (ret < 0)
                         break;
 
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 2a03bf53cb29..4fadddb264d6 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -175,7 +175,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * e
  * @param nlen Number of bytes in needle.
  * @return Pointer into haystack needle was found at, or NULL if not found.
  */
-static u8 *findstr(u8 * haystack, int hlen, u8 * needle, int nlen)
+static char *findstr(char * haystack, int hlen, char * needle, int nlen)
 {
         int i;
 
@@ -482,7 +482,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
         }
 
         /* check it contains the correct DVB string */
-        dvb_str = findstr(tuple, tupleLength, "DVB_CI_V", 8);
+        dvb_str = findstr((char *)tuple, tupleLength, "DVB_CI_V", 8);
         if (dvb_str == NULL)
                 return -EINVAL;
         if (tupleLength < ((dvb_str - (char *) tuple) + 12))
@@ -513,8 +513,8 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
                         ca->slot_info[slot].config_option = tuple[0] & 0x3f;
 
                         /* OK, check it contains the correct strings */
-                        if ((findstr(tuple, tupleLength, "DVB_HOST", 8) == NULL) ||
-                            (findstr(tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL))
+                        if ((findstr((char *)tuple, tupleLength, "DVB_HOST", 8) == NULL) ||
+                            (findstr((char *)tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL))
                                 break;
 
                         got_cftableentry = 1;
@@ -1300,7 +1300,7 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
         struct dvb_ca_private *ca = dvbdev->priv;
         u8 slot, connection_id;
         int status;
-        char fragbuf[HOST_LINK_BUF_SIZE];
+        u8 fragbuf[HOST_LINK_BUF_SIZE];
         int fragpos = 0;
         int fraglen;
         unsigned long timeout;
@@ -1486,7 +1486,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
                                 }
 
                                 if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2,
-                                                                      buf + pktlen, fraglen, 1)) < 0) {
+                                                                      (u8 *)buf + pktlen, fraglen, 1)) < 0) {
                                         goto exit;
                                 }
                                 pktlen += fraglen;
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 6d8d1c3df863..cb6987fce26c 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -1068,7 +1068,7 @@ static int dvbdmx_write(struct dmx_demux *demux, const char *buf, size_t count)
 
         if (mutex_lock_interruptible(&dvbdemux->mutex))
                 return -ERESTARTSYS;
-        dvb_dmx_swfilter(dvbdemux, buf, count);
+        dvb_dmx_swfilter(dvbdemux, (u8 *)buf, count);
         mutex_unlock(&dvbdemux->mutex);
 
         if (signal_pending(current))
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index f233d78bc364..a770a87b9a93 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -103,7 +103,7 @@ struct dvb_frontend_ops {
         int (*tune)(struct dvb_frontend* fe,
                     struct dvb_frontend_parameters* params,
                     unsigned int mode_flags,
-                    int *delay,
+                    unsigned int *delay,
                     fe_status_t *status);
         /* get frontend tuning algorithm from the module */
         int (*get_frontend_algo)(struct dvb_frontend *fe);