diff options
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_av.c')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 58678c05aa53..f7a8219d7cfe 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -391,7 +391,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count) | |||
391 | ****************************************************************************/ | 391 | ****************************************************************************/ |
392 | 392 | ||
393 | static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, | 393 | static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, |
394 | const char *buf, unsigned long count) | 394 | const u8 *buf, unsigned long count) |
395 | { | 395 | { |
396 | unsigned long todo = count; | 396 | unsigned long todo = count; |
397 | int free; | 397 | int free; |
@@ -436,7 +436,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv) | |||
436 | #define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \ | 436 | #define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \ |
437 | dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024) | 437 | dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024) |
438 | 438 | ||
439 | static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf, | 439 | static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf, |
440 | unsigned long count, int nonblock, int type) | 440 | unsigned long count, int nonblock, int type) |
441 | { | 441 | { |
442 | unsigned long todo = count, n; | 442 | unsigned long todo = count, n; |
@@ -499,7 +499,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, | |||
499 | return count - todo; | 499 | return count - todo; |
500 | } | 500 | } |
501 | 501 | ||
502 | static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf, | 502 | static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf, |
503 | unsigned long count, int nonblock, int type) | 503 | unsigned long count, int nonblock, int type) |
504 | { | 504 | { |
505 | unsigned long todo = count, n; | 505 | unsigned long todo = count, n; |
@@ -959,7 +959,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x | |||
959 | 959 | ||
960 | #define MIN_IFRAME 400000 | 960 | #define MIN_IFRAME 400000 |
961 | 961 | ||
962 | static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len, int nonblock) | 962 | static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock) |
963 | { | 963 | { |
964 | int i, n; | 964 | int i, n; |
965 | 965 | ||