diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 13 |
5 files changed, 22 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index b42f8a42e..669a457af 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.41 2005/09/10 10:30:52 mchehab Exp $ + * $Id: cx88-core.c,v 1.42 2005/09/11 04:58:14 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -440,7 +440,7 @@ int cx88_sram_channel_setup(struct cx88_core *core, /* ------------------------------------------------------------------ */ /* debug helper code */ -int cx88_risc_decode(u32 risc) +static int cx88_risc_decode(u32 risc) { static char *instr[16] = { [ RISC_SYNC >> 28 ] = "sync", diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 03fa87887..a0a60433d 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.92 2005/09/06 21:58:43 catalin Exp $ + * $Id: cx88-video.c,v 1.93 2005/09/11 04:58:14 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1028,7 +1028,7 @@ static int video_open(struct inode *inode, struct file *file) } static ssize_t -video_read(struct file *file, char *data, size_t count, loff_t *ppos) +video_read(struct file *file, char __user *data, size_t count, loff_t *ppos) { struct cx8800_fh *fh = file->private_data; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 97e03b421..c23478890 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.79 2005/09/10 10:30:52 mchehab Exp $ + * $Id: cx88.h,v 1.80 2005/09/11 04:58:14 mkrufky Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -209,8 +209,8 @@ struct cx88_board { int tda9887_conf; struct cx88_input input[MAX_CX88_INPUT]; struct cx88_input radio; - int blackbird:1; - int dvb:1; + unsigned int blackbird:1; + unsigned int dvb:1; }; struct cx88_subid { diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 8c2889150..469f02378 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -839,7 +839,7 @@ struct v4l2_vbi_format #define V4L2_VBI_INTERLACED (1<< 1) #if 1 /*KEEP*/ -/* Sliced VBI +/* Sliced VBI * * This implements is a proposal V4L2 API to allow SLICED VBI * required for some hardware encoders. It should change without @@ -853,7 +853,7 @@ struct v4l2_sliced_vbi_format service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field (equals frame lines 313-336 for 625 line video standards, 263-286 for 525 line standards) */ - __u16 service_lines[2][24]; + __u16 service_lines[2][24]; __u32 io_size; __u32 reserved[2]; /* must be zero */ }; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 24a3a1e59..b354891ee 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-09-11 04:56 mkrufky + + * cx88-core.c: (cx88_risc_decode): + * cx88-video.c: (video_read): + * cx88.h: + - Fix a number of sparse warnings. + + * videodev2.h: + - strip trailing whitespace. + + Signed-off-by: Peter Hagervall <hager@cs.umu.se> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-11 01:15 mchehab * videodev2.h: |