aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorPeter Hagervall <hager@cs.umu.se>2005-11-09 00:36:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:09 -0500
commitf9e7a0203def0704beaf4af1ff2c772f9fa712cf (patch)
tree28805b79f81a7e6ed1ff67329a984641ae53520b /drivers/media/video
parentc5df599b67b5a061d28a2154a49f9704e0d1040b (diff)
[PATCH] v4l: 651: fix a number of sparse warnings
- Fix a number of sparse warnings. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-core.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c2
-rw-r--r--drivers/media/video/cx88/cx88.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 87212759149e..8f1c27fdae6a 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -431,7 +431,7 @@ int cx88_sram_channel_setup(struct cx88_core *core,
431/* ------------------------------------------------------------------ */ 431/* ------------------------------------------------------------------ */
432/* debug helper code */ 432/* debug helper code */
433 433
434int cx88_risc_decode(u32 risc) 434static int cx88_risc_decode(u32 risc)
435{ 435{
436 static char *instr[16] = { 436 static char *instr[16] = {
437 [ RISC_SYNC >> 28 ] = "sync", 437 [ RISC_SYNC >> 28 ] = "sync",
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 67630f61c470..a29c12754ef6 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -787,7 +787,7 @@ static int video_open(struct inode *inode, struct file *file)
787} 787}
788 788
789static ssize_t 789static ssize_t
790video_read(struct file *file, char *data, size_t count, loff_t *ppos) 790video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
791{ 791{
792 struct cx8800_fh *fh = file->private_data; 792 struct cx8800_fh *fh = file->private_data;
793 793
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 3d885b4025d8..bd27b56ace26 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -204,8 +204,8 @@ struct cx88_board {
204 int tda9887_conf; 204 int tda9887_conf;
205 struct cx88_input input[MAX_CX88_INPUT]; 205 struct cx88_input input[MAX_CX88_INPUT];
206 struct cx88_input radio; 206 struct cx88_input radio;
207 int blackbird:1; 207 unsigned int blackbird:1;
208 int dvb:1; 208 unsigned int dvb:1;
209}; 209};
210 210
211struct cx88_subid { 211struct cx88_subid {