diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-28 19:37:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:46:27 -0400 |
commit | ae8aed0314064da3002879fedc2d262c72865a17 (patch) | |
tree | fdb7d2d6c62a218f61c8537122a05899b9373d1c | |
parent | be88ec74cb48d1f60d0c0f059843f846f4481d87 (diff) |
[PATCH] saa6588 __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/video/rds.h | 2 | ||||
-rw-r--r-- | drivers/media/video/saa6588.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/rds.h b/drivers/media/video/rds.h index 30337d0f1a87..0d30eb744e61 100644 --- a/drivers/media/video/rds.h +++ b/drivers/media/video/rds.h | |||
@@ -31,7 +31,7 @@ | |||
31 | struct rds_command { | 31 | struct rds_command { |
32 | unsigned int block_count; | 32 | unsigned int block_count; |
33 | int result; | 33 | int result; |
34 | unsigned char *buffer; | 34 | unsigned char __user *buffer; |
35 | struct file *instance; | 35 | struct file *instance; |
36 | poll_table *event_list; | 36 | poll_table *event_list; |
37 | }; | 37 | }; |
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index 1a657a70ff43..72b70eb5da1d 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c | |||
@@ -157,7 +157,7 @@ static struct i2c_client client_template; | |||
157 | 157 | ||
158 | /* ---------------------------------------------------------------------- */ | 158 | /* ---------------------------------------------------------------------- */ |
159 | 159 | ||
160 | static int block_to_user_buf(struct saa6588 *s, unsigned char *user_buf) | 160 | static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf) |
161 | { | 161 | { |
162 | int i; | 162 | int i; |
163 | 163 | ||
@@ -191,7 +191,7 @@ static void read_from_buf(struct saa6588 *s, struct rds_command *a) | |||
191 | { | 191 | { |
192 | unsigned long flags; | 192 | unsigned long flags; |
193 | 193 | ||
194 | unsigned char *buf_ptr = a->buffer; /* This is a user space buffer! */ | 194 | unsigned char __user *buf_ptr = a->buffer; |
195 | unsigned int i; | 195 | unsigned int i; |
196 | unsigned int rd_blocks; | 196 | unsigned int rd_blocks; |
197 | 197 | ||